Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[automated] Merge branch 'release/9.0.1xx' => 'main' #43065

Merged
merged 66 commits into from
Sep 3, 2024

Conversation

github-actions[bot]
Copy link
Contributor

I detected changes in the release/9.0.1xx branch which have not been merged yet to main. I'm a robot and am configured to help you automatically keep main up to date, so I've opened this PR.

This PR merges commits made on release/9.0.1xx by the following committers:

  • v-wuzhai
  • dotnet-maestro[bot]
  • marcpopMSFT
  • Forgind
  • jjonescz
  • baronfel
  • vseanreesermsft
  • dotnet-bot

Instructions for merging from UI

This PR will not be auto-merged. When pull request checks pass, complete this PR by creating a merge commit, not a squash or rebase commit.

merge button instructions

If this repo does not allow creating merge commits from the GitHub UI, use command line instructions.

Instructions for merging via command line

Run these commands to merge this pull request from the command line.

git fetch
git checkout release/9.0.1xx
git pull --ff-only
git checkout main
git pull --ff-only
git merge --no-ff release/9.0.1xx

# If there are merge conflicts, resolve them and then run git merge --continue to complete the merge
# Pushing the changes to the PR branch will re-trigger PR validation.
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.1xx-to-main
or if you are using SSH
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.1xx-to-main

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or using the command line.

Instructions for updating this pull request

Contributors to this repo have permission update this pull request by pushing to the branch 'merge/release/9.0.1xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.

git checkout -b merge/release/9.0.1xx-to-main main
git pull https://github.com/dotnet/sdk merge/release/9.0.1xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/sdk HEAD:merge/release/9.0.1xx-to-main
or if you are using SSH
git checkout -b merge/release/9.0.1xx-to-main main
git pull git@github.com:dotnet/sdk merge/release/9.0.1xx-to-main
(make changes)
git commit -m "Updated PR with my changes"
git push git@github.com:dotnet/sdk HEAD:merge/release/9.0.1xx-to-main

Contact .NET Core Engineering (dotnet/dnceng) if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/main/.github/workflows/scripts/inter-branch-merge.ps1.

dotnet-bot and others added 30 commits July 12, 2024 22:04
…otnet-aspnetcore build 20240708.8

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0
 From Version 8.0.7-servicing.24314.2 -> To Version 8.0.8-servicing.24358.8
…otnet-runtime build 20240702.10

Microsoft.Extensions.DependencyModel , Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , System.Security.Cryptography.Xml , System.Text.Json , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0
 From Version 8.0.1 -> To Version 8.0.1

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100
 From Version 8.0.7 -> To Version 8.0.7 (parent: Microsoft.NETCore.App.Runtime.win-x64
…otnet-windowsdesktop build 20240710.3

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0
 From Version 8.0.7 -> To Version 8.0.8
…otnet-aspnetcore build 20240712.9

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0
 From Version 8.0.7-servicing.24314.2 -> To Version 8.0.8-servicing.24362.9
…3 repositories

This pull request updates the following dependencies

[marker]: <> (Begin:1ab2aba6-b648-40a9-9fe8-08dca2920c50)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1ab2aba6-b648-40a9-9fe8-08dca2920c50
- **Build**: 20240712.9
- **Date Produced**: July 13, 2024 4:33:32 AM UTC
- **Commit**: 3483d65ea57ac7711115b873fa815b05c7a624e1
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **dotnet-user-jwts**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **dotnet-user-secrets**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.Analyzers**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.AspNetCore.Authorization**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.Components.Web**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]
  - **Microsoft.AspNetCore.TestHost**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.Extensions.ObjectPool**: [from 8.0.7 to 8.0.8][2]
  - **Microsoft.JSInterop**: [from 8.0.7 to 8.0.8][2]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.7-servicing.24314.2 to 8.0.8-servicing.24362.9][2]

[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC2f1db20456007c9515068a35a65afdf99af70bc6&targetVersion=GC3483d65ea57ac7711115b873fa815b05c7a624e1&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1ab2aba6-b648-40a9-9fe8-08dca2920c50)

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.7 to 8.0.7 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[ma...
…otnet-runtime build 20240716.12

Microsoft.NET.HostModel , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Host.win-x64 , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.DotNetHostResolver , Microsoft.NETCore.Platforms , VS.Redist.Common.NetCore.SharedFramework.x64.8.0 , VS.Redist.Common.NetCore.TargetingPack.x64.8.0
 From Version 8.0.8-servicing.24352.10 -> To Version 8.0.8-servicing.24366.12

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100
 From Version 8.0.7 -> To Version 8.0.8 (parent: Microsoft.NETCore.App.Runtime.win-x64
…dnceng/internal/dotnet-runtime

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: from 8.0.7 to 8.0.8 (parent: Microsoft.NETCore.App.Runtime.win-x64)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:82bc8158-ef88-4a27-3f7b-08dca299e604)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-runtime
- **Subscription**: 82bc8158-ef88-4a27-3f7b-08dca299e604
- **Build**: 20240716.12
- **Date Produced**: July 16, 2024 10:31:44 PM UTC
- **Commit**: 08338fcaa5c9b9a8190abb99222fed12aaba956c
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.NET.HostModel**: [from 8.0.8-servicing.24352.10 to 8.0.8-servicing.24366.12][1]
  - **Microsoft.NET.ILLink.Tasks**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.NETCore.App.Host.win-x64**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.NETCore.App.Ref**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.NETCore.App.Runtime.win-x64**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.NETCore.DotNetHostResolver**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.NETCore.Platforms**: [from 8.0.8-servicing.24352.10 to 8.0.8-servicing.24366.12][1]
  - **VS.Redist.Common.NetCore.SharedFramework.x64.8.0**: [from 8.0.8-servicing.24352.10 to 8.0.8-servicing.24366.12][1]
  - **VS.Redist.Common.NetCore.TargetingPack.x64.8.0**: [from 8.0.8-servicing.24352.10 to 8.0.8-servicing.24366.12][1]
  - **Microsoft.NET.Workload.Emscripten.Current.Manifest-8.0.100**: [from 8.0.7 to 8.0.8][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-runtime/branches?baseVersion=GC40a8492d8bfb56a0a31d7d2e8de2b7ebbd60982a&targetVersion=GC08338fcaa5c9b9a8190abb99222fed12aaba956c&_a=files
[2]: dotnet/emsdk@be13dab...e92f92e

[DependencyUpdate]: <> (End)

[marker]: <> (End:82bc8158-ef88-4a27-3f7b-08dca299e604)
…otnet-windowsdesktop build 20240716.8

Microsoft.WindowsDesktop.App.Ref , Microsoft.WindowsDesktop.App.Runtime.win-x64 , VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0 , VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0
 From Version 8.0.8 -> To Version 8.0.8

Dependency coherency updates

Microsoft.NET.Sdk.WindowsDesktop
 From Version 8.0.7-servicing.24313.7 -> To Version 8.0.8-servicing.24366.7 (parent: Microsoft.WindowsDesktop.App.Ref
…dnceng/internal/dotnet-windowsdesktop

This pull request updates the following dependencies

[marker]: <> (Begin:Coherency Updates)
## Coherency Updates

The following updates ensure that dependencies with a *CoherentParentDependency*
attribute were produced in a build used as input to the parent dependency's build.
See [Dependency Description Format](https://github.com/dotnet/arcade/blob/master/Documentation/DependencyDescriptionFormat.md#dependency-description-overview)

[DependencyUpdate]: <> (Begin)

- **Coherency Updates**:
  - **Microsoft.NET.Sdk.WindowsDesktop**: from 8.0.7-servicing.24313.7 to 8.0.8-servicing.24366.7 (parent: Microsoft.WindowsDesktop.App.Ref)

[DependencyUpdate]: <> (End)

[marker]: <> (End:Coherency Updates)

[marker]: <> (Begin:11ffd28b-eb51-469a-d3fb-08dca292067e)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop
- **Subscription**: 11ffd28b-eb51-469a-d3fb-08dca292067e
- **Build**: 20240716.8
- **Date Produced**: July 17, 2024 6:54:51 AM UTC
- **Commit**: 1526afd4eae1d862d586402ef8e005151a919d52
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **Microsoft.WindowsDesktop.App.Ref**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.WindowsDesktop.App.Runtime.win-x64**: [from 8.0.8 to 8.0.8][1]
  - **VS.Redist.Common.WindowsDesktop.SharedFramework.x64.8.0**: [from 8.0.8-servicing.24360.3 to 8.0.8-servicing.24366.8][1]
  - **VS.Redist.Common.WindowsDesktop.TargetingPack.x64.8.0**: [from 8.0.8-servicing.24360.3 to 8.0.8-servicing.24366.8][1]
  - **Microsoft.NET.Sdk.WindowsDesktop**: [from 8.0.7-servicing.24313.7 to 8.0.8-servicing.24366.7][2]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-windowsdesktop/branches?baseVersion=GC1379ef1cadaa3c2463ae82a9c926ae6ea7741c5a&targetVersion=GC1526afd4eae1d862d586402ef8e005151a919d52&_a=files
[2]: https://dev.azure.com/dnceng/internal/_git/dotnet-wpf/branches?baseVersion=GC43bb8cc831c2658e1117415019264bfe6f644f94&targetVersion=GC883fc207bb50622d4458ff09ae6a62548783826a&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:11ffd28b-eb51-469a-d3fb-08dca292067e)
…otnet-aspnetcore build 20240719.8

dotnet-dev-certs , dotnet-user-jwts , dotnet-user-secrets , Microsoft.AspNetCore.Analyzers , Microsoft.AspNetCore.App.Ref , Microsoft.AspNetCore.App.Ref.Internal , Microsoft.AspNetCore.App.Runtime.win-x64 , Microsoft.AspNetCore.Authorization , Microsoft.AspNetCore.Components.SdkAnalyzers , Microsoft.AspNetCore.Components.Web , Microsoft.AspNetCore.DeveloperCertificates.XPlat , Microsoft.AspNetCore.Mvc.Analyzers , Microsoft.AspNetCore.Mvc.Api.Analyzers , Microsoft.AspNetCore.TestHost , Microsoft.Extensions.FileProviders.Embedded , Microsoft.Extensions.ObjectPool , Microsoft.JSInterop , VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0
 From Version 8.0.8-servicing.24362.9 -> To Version 8.0.8-servicing.24369.8
…dnceng/internal/dotnet-aspnetcore

This pull request updates the following dependencies

[marker]: <> (Begin:1ab2aba6-b648-40a9-9fe8-08dca2920c50)
## From https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore
- **Subscription**: 1ab2aba6-b648-40a9-9fe8-08dca2920c50
- **Build**: 20240719.8
- **Date Produced**: July 20, 2024 12:20:35 AM UTC
- **Commit**: 954f61dd38b33caa2b736c73530bd5a294174437
- **Branch**: refs/heads/internal/release/8.0

[DependencyUpdate]: <> (Begin)

- **Updates**:
  - **dotnet-dev-certs**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **dotnet-user-jwts**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **dotnet-user-secrets**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.Analyzers**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.App.Ref**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.AspNetCore.App.Ref.Internal**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.App.Runtime.win-x64**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.AspNetCore.Authorization**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.AspNetCore.Components.SdkAnalyzers**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.Components.Web**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.AspNetCore.DeveloperCertificates.XPlat**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.Mvc.Analyzers**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.Mvc.Api.Analyzers**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]
  - **Microsoft.AspNetCore.TestHost**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.Extensions.FileProviders.Embedded**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.Extensions.ObjectPool**: [from 8.0.8 to 8.0.8][1]
  - **Microsoft.JSInterop**: [from 8.0.8 to 8.0.8][1]
  - **VS.Redist.Common.AspNetCore.SharedFramework.x64.8.0**: [from 8.0.8-servicing.24362.9 to 8.0.8-servicing.24369.8][1]

[1]: https://dev.azure.com/dnceng/internal/_git/dotnet-aspnetcore/branches?baseVersion=GC3483d65ea57ac7711115b873fa815b05c7a624e1&targetVersion=GC954f61dd38b33caa2b736c73530bd5a294174437&_a=files

[DependencyUpdate]: <> (End)

[marker]: <> (End:1ab2aba6-b648-40a9-9fe8-08dca2920c50)
Updated Version.Details.xml - fix released package shas

----
#### AI description  (iteration 1)
#### PR Classification
Bug fix to update released package SHA values.

#### PR Summary
This pull request updates the SHA values for several dependencies in the `Version.Details.xml` file to reflect the correct released package SHAs.
- Updated SHA for `Microsoft.Extensions.DependencyModel` in `/eng/Version.Details.xml`
- Updated SHA for `System.Text.Json` in `/eng/Version.Details.xml`
- Updated SHA for `System.Security.Cryptography.Xml` in `/eng/Version.Details.xml`
… separately for pull and...

Added new set of credential env variables to be used separately for pull and push operations. Old set of variables is used for fallback.

----
#### AI description  (iteration 1)
#### PR Classification
New feature: Added support for separate credential environment variables for different registry modes (push, pull, pull from output).

#### PR Summary
This pull request introduces new environment variables for Docker credentials based on registry modes and updates the relevant classes and tests to support this feature.
- `AuthHandshakeMessageHandler.cs`: Added `GetDockerCredentialsFromEnvironment` method to fetch credentials based on registry mode.
- `Registry.cs`: Introduced `RegistryMode` enum and updated constructors to handle different registry modes.
- `DefaultRegistryAPI.cs`: Updated to use registry mode when creating HTTP clients.
- `ContainerHelpers.cs`: Added new constants for push and pull registry credentials.
- Added unit tests in `AuthHandshakeMessageHandlerTests.cs` to verify the new credential fetching logic.
…-merge-8.0.4xx-2024-08-13-1058-2ed46940-639e-4783-a7da-4d419a3f9404
…0240815.2

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.401-servicing.24408.2 -> To Version 8.0.402-servicing.24415.2
…nce-packages (#42762)

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
…0240815.15

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.402-servicing.24415.2 -> To Version 8.0.402-servicing.24415.15
…0240818.1

Microsoft.SourceBuild.Intermediate.templating , Microsoft.TemplateEngine.Abstractions , Microsoft.TemplateEngine.Mocks
 From Version 8.0.402-servicing.24415.15 -> To Version 8.0.402-servicing.24418.1
dotnet-maestro bot and others added 15 commits August 28, 2024 17:00
…6.12.0.85

Microsoft.Build.NuGetSdkResolver , NuGet.Build.Tasks , NuGet.Build.Tasks.Console , NuGet.Build.Tasks.Pack , NuGet.CommandLine.XPlat , NuGet.Commands , NuGet.Common , NuGet.Configuration , NuGet.Credentials , NuGet.DependencyResolver.Core , NuGet.Frameworks , NuGet.LibraryModel , NuGet.Localization , NuGet.Packaging , NuGet.ProjectModel , NuGet.Protocol , NuGet.Versioning
 From Version 6.12.0-preview.1.84 -> To Version 6.12.0-preview.1.85
Fixes #42582

Specifying a workload set version in the global.json file is a supported scenario. If that workload set has not yet been installed, and the user tries to take an action that relies on workloads, we should error and indicate that they should make sure that workload set is installed first via update, install, or restore. We do that correctly, but when the user subsequently restores, we do not escape from the error case and instead direct the user to run restore. We should handle it properly, essentially installing the workload set before we discover which workloads the user needs and installing those.
…28.4

Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.24427.4 -> To Version 9.0.0-preview.24428.4
…28.5

Microsoft.SourceBuild.Intermediate.razor , Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport
 From Version 9.0.0-preview.24428.4 -> To Version 9.0.0-preview.24428.5
@github-actions github-actions bot requested a review from a team as a code owner August 29, 2024 07:50
@dotnet-issue-labeler dotnet-issue-labeler bot added Area-Infrastructure untriaged Request triage from a team member labels Aug 29, 2024
@v-wuzhai
Copy link
Member

@Forgind @baronfel Looks like there is a failed test related to the workload. Can you take a look?

@Forgind
Copy link
Member

Forgind commented Aug 30, 2024

@Forgind @baronfel Looks like there is a failed test related to the workload. Can you take a look?

I just tried running that test locally from this PR, and it didn't fail. I'm going to try rerunning to see if that works.

@Forgind
Copy link
Member

Forgind commented Aug 30, 2024

Now I looked at the actual failure, and it seems like it's unrelated to the test that's failing. It's basically just saying some workloads are out of alignment, which probably means one or more were pushed to nuget without their dependencies being pushed.

@dsplaisted
Copy link
Member

Workload update failed: Workload manifest dependency 'Microsoft.NET.Workload.Emscripten.Current' version '9.0.0-rc.1.24420.5' is lower than version '10.0.0-alpha.1.24421.1' required by manifest 'microsoft.net.workload.mono.toolchain.current' [/private/tmp/helix/working/9BE1090C/p/d/sdk-manifests/9.0.100-rc.1/microsoft.net.workload.mono.toolchain.current/9.0.0-rc.1.24423.3/WorkloadManifest.json]

This looks similar to issues we've had in the past where the branding for dotnet/runtime went in before dotnet/emscripten and the manifest version dependency breaks.

@steveisok Will we have a 10.0 manifest for emscripten soon, and do you think that will fix this?

FYI @marcpopMSFT

@dsplaisted
Copy link
Member

Looks like the emscripten update may be coming in via #43061, but that has issues related to the switch to .NET 10.

@marcpopMSFT marcpopMSFT merged commit 12f1d53 into main Sep 3, 2024
37 checks passed
@marcpopMSFT marcpopMSFT deleted the merge/release/9.0.1xx-to-main branch September 3, 2024 20:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Area-Infrastructure untriaged Request triage from a team member
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants