-
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/8.0.3xx' => 'main' #39786
Merged
MiYanni
merged 153 commits into
dotnet:main
from
dotnet-maestro-bot:merge/release/8.0.3xx-to-main
Apr 19, 2024
Merged
[automated] Merge branch 'release/8.0.3xx' => 'main' #39786
MiYanni
merged 153 commits into
dotnet:main
from
dotnet-maestro-bot:merge/release/8.0.3xx-to-main
Apr 19, 2024
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
…mage.Interface.cs Co-authored-by: Rainer Sigwald <[email protected]>
Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal , Microsoft.CodeAnalysis.Razor.Tooling.Internal , Microsoft.NET.Sdk.Razor.SourceGenerators.Transport From Version 7.0.0-preview.24164.2 -> To Version 7.0.0-preview.24164.4
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 From Version 4.10.0-3.24164.1 -> To Version 4.10.0-3.24164.3
This PR should enable installing and updating via workload sets. In particular, if you have mode set to workload sets (and don't use a rollback file), it will now look for the latest workload set (or latest stable if you don't specify to use previews) and install/update to that rather than updating manifests individually. It now also supports dotnet workload update --version x where it will update the workload set version x. Finally, it now will display the workload set it is using if it's set to use workload sets in the install state file when the user runs dotnet workload list. All functionality was manually tested at some point, and there's a new unit test.
…teFile/RemoteDirectory
…0328.7 Microsoft.SourceBuild.Intermediate.msbuild , Microsoft.Build , Microsoft.Build.Localization From Version 17.10.0-preview-24177-05 -> To Version 17.11.0-preview-24178-07
…240327.7 Microsoft.NET.Test.Sdk , Microsoft.TestPlatform.Build , Microsoft.TestPlatform.CLI From Version 17.10.0-preview-24170-01 -> To Version 17.10.0-release-24177-07
…327.10 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 From Version 4.11.0-1.24176.16 -> To Version 4.11.0-1.24177.10
…327.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24176.8 -> To Version 8.0.0-beta.24177.1
…39720) [release/8.0.3xx] Update dependencies from dotnet/templating
[release/8.0.3xx] Update dependencies from dotnet/razor
v-wuzhai
force-pushed
the
merge/release/8.0.3xx-to-main
branch
from
April 1, 2024 06:56
628ad20
to
c68dc87
Compare
v-wuzhai
force-pushed
the
merge/release/8.0.3xx-to-main
branch
from
April 1, 2024 07:38
c8bba37
to
43f3248
Compare
@Forgind @dsplaisted would you be able to review these changes? Thanks! |
I was surprised to see workload vm testing had not made it to main yet, not sure why this codeflow took so long to generate |
Waiting for the code flow from #39573 to first be integrated into the main branch. |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
Forgind
approved these changes
Apr 18, 2024
dsplaisted
approved these changes
Apr 18, 2024
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/8.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/8.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/8.0.3xx-to-main'. This can be done to resolve conflicts or make other changes to this pull request before it is merged.
or if you are using SSH
Contact .NET Core Engineering if you have questions or issues.
Also, if this PR was generated incorrectly, help us fix it. See https://github.com/dotnet/arcade/blob/master/scripts/GitHubMergeBranches.ps1.