[automated] Merge branch 'release/6.0.4xx' => 'release/7.0.1xx' #27214
Conversation
This file contains hidden or 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
…812.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.SignTool , Microsoft.DotNet.XUnitExtensions From Version 6.0.0-beta.22411.3 -> To Version 6.0.0-beta.22412.2
…0815.1 Microsoft.Build , Microsoft.Build.Localization From Version 17.3.0 -> To Version 17.3.1
…693c-787d-46cd-9a31-5e56673b32e5 [release/6.0.4xx] Update dependencies from dotnet/msbuild
…16b2-516e-4238-a6d7-4cee2c5bcb12 [release/6.0.4xx] Update dependencies from dotnet/arcade
…815.1 Microsoft.CodeAnalysis , Microsoft.CodeAnalysis.CSharp , Microsoft.CodeAnalysis.CSharp.Features , Microsoft.CodeAnalysis.CSharp.Workspaces , Microsoft.CodeAnalysis.Workspaces.MSBuild , Microsoft.Net.Compilers.Toolset From Version 4.3.0-3.22412.4 -> To Version 4.3.0-3.22415.1
Adds a parser that can handle all the msbuild property variations, so that arguments that contain a semicolon- delimited key/value list are correctly escaped.
…b49b-fac3-4a13-883b-a004097c2a14 [release/6.0.4xx] Update dependencies from dotnet/roslyn
…rameworks If there are multiple matching WindowsSdkSupportedTargetPlatformVersion items, choose the one with the highest minimum version. That way it is possible to use older packages when targeting older versions of .NET, and newer packages for newer versions of .NET
Support different Windows SDK package versions for different target frameworks
ghost
added
the
* [Blazor] Update the base path to use IntermediateOutputPath (dotnet#26765) It was done a different way because a while ago we were computing the path inside a global PropertyGroup and when we changed it to be computed inside a target, we didn't change it to just rely on the IntermediateOutputPath. (cherry picked from commit ab4d89f) * [Blazor] Allow customizing the static web assets base manifest paths if defined by the environment (dotnet#27102) (cherry picked from commit bcb1cd2) Co-authored-by: Javier Calvarro Nelson <[email protected]>
v-wuzhai
force-pushed
the
merge/release/6.0.4xx-to-release/7.0.1xx
branch
from
1d509dd to
b60d7b2
Compare
dsplaisted
approved these changes
Aug 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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/6.0.4xx branch which have not been merged yet to release/7.0.1xx. I'm a robot and am configured to help you automatically keep release/7.0.1xx up to date, so I've opened this PR.
This PR merges commits made on release/6.0.4xx 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/6.0.4xx-to-release/7.0.1xx'. 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.