-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.3xx' => 'main' #47882
Merged
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…23.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.25171.5 -> To Version 9.0.0-preview.25173.4
…24.2 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.25173.4 -> To Version 9.0.0-preview.25174.2
…324.10 Microsoft.SourceBuild.Intermediate.roslyn , Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.CodeStyle , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset , Microsoft.Net.Compilers.Toolset.Framework From Version 4.14.0-3.25171.27 -> To Version 4.14.0-3.25174.10
Fixes #47794 I ported the changes over to main for actual testing, hence this being targeted at 9.0.3xx but mentioning a 10.0- feature band. Without the change: Workload version: 10.0.100-manifests.7ab2c471 Installed Workload Id Manifest Version Installation Source ----------------------------------------------------------------------------------------------- android 35.99.0-preview.1.140/10.0.100-preview.1 VS 17.14.35824.293 aspire 8.2.2/8.0.100 VS 17.14.35824.293 ios 18.2.10322-net10-p1/10.0.100-preview.1 VS 17.14.35824.293 maccatalyst 18.2.10322-net10-p1/10.0.100-preview.1 VS 17.14.35824.293 macos 15.2.10322-net10-p1/10.0.100-preview.1 VS 17.14.35824.293 maui-windows 10.0.0-preview.1.25122.6/10.0.100-preview.1 VS 17.14.35824.293 tvos 18.2.10322-net10-p1/10.0.100-preview.1 VS 17.14.35824.293 wasm-tools 10.0.0-preview.4.25170.5/10.0.100-preview.4 VS 17.14.35824.293 wasm-tools-net6 10.0.0-preview.4.25170.5/10.0.100-preview.4 VS 17.14.35824.293 wasm-tools-net7 10.0.0-preview.4.25170.5/10.0.100-preview.4 VS 17.14.35824.293 wasm-tools-net8 10.0.0-preview.4.25170.5/10.0.100-preview.4 VS 17.14.35824.293 Use `dotnet workload search` to find additional workloads to install. With the change: Installed Workload Id Manifest Version Installation Source -------------------------------------------------------------------- Use `dotnet workload search` to find additional workloads to install. (I hadn't installed any workloads at that point, so empty is correct.) I then installed wasm-tools and ran it again and got this result: Installed Workload Id Manifest Version Installation Source ----------------------------------------------------------------------------------------------- wasm-tools 10.0.0-preview.3.25167.9/10.0.100-preview.3 SDK 10.0.100 Use `dotnet workload search` to find additional workloads to install.
…se/9.0.3xx-to-main
v-wuzhai
approved these changes
Mar 26, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I detected changes in the release/9.0.3xx 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.3xx by the following committers:
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.
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.
or if you are using SSH
After PR checks are complete push the branch
Instructions for resolving conflicts
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.3xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
The provided examples assume that the remote is named 'origin'. If you have a different remote name, please replace 'origin' with the name of your remote.
or if you are using SSH
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.