[automated] Merge branch 'vs17.12' => 'main' #10875
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}
Part of #10665 Final branding for VS17.12.
…: Build ID 10325489 (#10748)
…10745) * Allow fast-abort of submissions even after EndBuild initiated * Bump version * Add test verifying the proper build abort on CancelAllSubmissions swapped * Bump version * bump version to 17.12.3 --------- Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
* Update dependencies from https://github.com/dotnet/arcade build 20241016.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24466.2 -> To Version 9.0.0-beta.24516.2 * Bump up version prefix * Remove unavailable BuildXL feed * Bump up dotnet version used in bootstrap along with dotnet bumped in global.json --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com>
…on ID 9434: Build ID 10415672 (#10849)
YuliiaKovalova
previously approved these changes
Oct 23, 2024
…: Build ID 10439581 (#10876) * Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 10439581 * bump the version to 17.12.9 --------- Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
|
This pull request has been updated. This PR merges commits made on vs17.12 by the following committers:
|
YuliiaKovalova
approved these changes
Oct 24, 2024
rainersigwald
approved these changes
Oct 25, 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.12 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 vs17.12 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.12-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 (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.