[automated] Merge branch 'vs17.11' => 'vs17.12' #11072
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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
…: Build ID 10000931 (#10267) * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 9752299 * Increase VersionPrefix version --------- Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
* Resolves CG alerts --------- Co-authored-by: Rainer Sigwald <raines@microsoft.com>
* Fixing the assembly redirect
* Update dependencies from https://github.com/dotnet/arcade build 20240910.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24460.4 * version bump --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Mariana Garces Dematte <magarces@microsoft.com>
Will address dotnet/sdk#43339 when deployed in VS. --------- Co-authored-by: Rainer Sigwald <raines@microsoft.com>
Part of: #10665 Disabling localization for 17.11.
* Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24508.1 * bump the version --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
* Bump Microsoft.IO.Redist to 6.0.1 * Bump version prefix to 17.11.11
* Update dependencies from https://github.com/dotnet/arcade build 20241112.12 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24562.12 * Update VersionPrefix to 17.11.16 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com>
…120.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5
This pull request updates the following dependencies [marker]: <> (Begin:aca86521-13b3-4d28-a005-127af3b681e5) ## From https://github.com/dotnet/arcade - **Subscription**: aca86521-13b3-4d28-a005-127af3b681e5 - **Build**: 20241120.5 - **Date Produced**: November 20, 2024 10:02:02 PM UTC - **Commit**: 3c7e11bf80279cde53a6251c4d0fa10e613fc739 - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - **Microsoft.SourceBuild.Intermediate.arcade**: [from 8.0.0-beta.24562.12 to 8.0.0-beta.24570.5][1] - **Microsoft.DotNet.Arcade.Sdk**: [from 8.0.0-beta.24562.12 to 8.0.0-beta.24570.5][1] - **Microsoft.DotNet.XUnitExtensions**: [from 8.0.0-beta.24562.12 to 8.0.0-beta.24570.5][1] [1]: dotnet/arcade@42652ca...3c7e11b [DependencyUpdate]: <> (End) [marker]: <> (End:aca86521-13b3-4d28-a005-127af3b681e5)
Backport of #11042 to vs17.11
Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>
|
This pull request has been updated. This PR merges commits made on vs17.11 by the following committers:
|
GangWang01
force-pushed
the
merge/vs17.11-to-vs17.12
branch
4 times, most recently
from
8c6db61 to
454edd8
Compare
GangWang01
force-pushed
the
merge/vs17.11-to-vs17.12
branch
from
f7f3a81 to
31ad273
Compare
GangWang01
approved these changes
Dec 10, 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 vs17.11 branch which have not been merged yet to vs17.12. I'm a robot and am configured to help you automatically keep vs17.12 up to date, so I've opened this PR.
This PR merges commits made on vs17.11 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/vs17.11-to-vs17.12'. 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.