[automated] Merge branch 'vs17.12' => 'vs17.13' #11495
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}
Don't ngen TaskHosts
[vs17.6] Dont ngen taskhost Fixes our lack of optprof data (#8737)
[vs17.6] Bump version
Update System.Security.Cryptography.Pkcs
[release/vs17.6] Onboard 1es templates (#9924)
* Bump Microsoft.IO.Redist to 6.0.1 * Bump System.Formats.Asn1 to 8.0.1 * Bump System.Text.Json to 8.0.0.4 * Bump the dependencies of System.Text.Json * Add System.Formats.Asn1 8.0.1 to the pre-built exception list * Bump version prefix to 17.8.8 * Updated System.Collection.Immutable package to v8 * Adding System.Collections.Immutable 8.0.0 to the pre-built exception list * Updated Version.Details.xml
* Update dependencies from https://github.com/dotnet/arcade build 20241008.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.24508.1 Dependency coherency updates Microsoft.DotNet.XliffTasks From Version 1.0.0-beta.23423.1 -> To Version 1.0.0-beta.23475.1 (parent: Microsoft.DotNet.Arcade.Sdk * remove BuildXL from nuget config * compatibility suppressions * Update dependencies from https://github.com/dotnet/arcade build 20241… Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24508.1 -> To Version 8.0.0-beta.24516.1 * include PortableRuntimeIdentifierGraph.json * Suppress a warning IDE0305 * bump version --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
* Update dependencies from https://github.com/dotnet/arcade build 20241112.12 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.8.11 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com>
…120.5 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:5f9c9524-456b-43ca-a978-063daaf53c38) ## From https://github.com/dotnet/arcade - **Subscription**: 5f9c9524-456b-43ca-a978-063daaf53c38 - **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.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:5f9c9524-456b-43ca-a978-063daaf53c38)
Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>
* fix setting package versions * use VS branch names in servicing package decision --------- Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>
* Update vs/msbuild version * Bump version
I detected changes in the vs17.8 branch which have not been merged yet to vs17.10. I'm a robot and am configured to help you automatically keep vs17.10 up to date, so I've opened this PR. This PR merges commits made on vs17.8 by the following committers: * @dotnet-maestro[bot] * @JanKrivanek * @JanProvaznik * @GangWang01 * @github-actions[bot] * @surayya-MS * @YuliiaKovalova * @sujitnayak ## 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. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> 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. ``` sh git fetch git checkout vs17.8 git pull --ff-only git checkout vs17.10 git pull --ff-only git merge --no-ff vs17.8 # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10 ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10 ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs17.8-to-vs17.10'. 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. ``` git fetch git checkout -b merge/vs17.8-to-vs17.10 origin/vs17.10 git pull https://github.com/dotnet/msbuild merge/vs17.8-to-vs17.10 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/vs17.8-to-vs17.10 origin/vs17.10 git pull git@github.com:dotnet/msbuild merge/vs17.8-to-vs17.10 (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10 ``` </details> 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.
* Update dependencies from https://github.com/dotnet/arcade build 20250211.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25105.2 -> To Version 8.0.0-beta.25111.4 * Update VersionPrefix to 17.10.22 * Update dependencies from https://github.com/dotnet/arcade build 20250214.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25105.2 -> To Version 8.0.0-beta.25114.5 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com>
* Update dependencies from https://github.com/dotnet/arcade build 20250211.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25105.2 -> To Version 8.0.0-beta.25111.4 * Update VersionPrefix to 17.11.27 * Update dependencies from https://github.com/dotnet/arcade build 20250214.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25105.2 -> To Version 8.0.0-beta.25114.5 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com>
* Update dependencies from https://github.com/dotnet/arcade build 20250211.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25077.4 -> To Version 9.0.0-beta.25111.5 * Update VersionPrefix to 17.12.31 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com>
Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>
I detected changes in the vs17.8 branch which have not been merged yet to vs17.10. I'm a robot and am configured to help you automatically keep vs17.10 up to date, so I've opened this PR. This PR merges commits made on vs17.8 by the following committers: * @github-actions[bot] ## 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. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> 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. ``` sh git fetch git checkout vs17.8 git pull --ff-only git checkout vs17.10 git pull --ff-only git merge --no-ff vs17.8 # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10 ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10 ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs17.8-to-vs17.10'. 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. ``` git fetch git checkout -b merge/vs17.8-to-vs17.10 origin/vs17.10 git pull https://github.com/dotnet/msbuild merge/vs17.8-to-vs17.10 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/vs17.8-to-vs17.10 origin/vs17.10 git pull git@github.com:dotnet/msbuild merge/vs17.8-to-vs17.10 (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/msbuild HEAD:merge/vs17.8-to-vs17.10 ``` </details> 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.
I detected changes in the vs17.10 branch which have not been merged yet to vs17.11. I'm a robot and am configured to help you automatically keep vs17.11 up to date, so I've opened this PR. This PR merges commits made on vs17.10 by the following committers: * @GangWang01 * @JanProvaznik * @github-actions[bot] * @dotnet-maestro[bot] * @JanKrivanek * @surayya-MS * @YuliiaKovalova * @sujitnayak ## 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. <img alt="merge button instructions" src="https://i.imgur.com/GepcNJV.png" width="300" /> 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. ``` sh git fetch git checkout vs17.10 git pull --ff-only git checkout vs17.11 git pull --ff-only git merge --no-ff vs17.10 # If there are merge conflicts, resolve them and then run git merge --continue to complete the merge # Pushing the changes to the PR branch will re-trigger PR validation. git push https://github.com/dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11 ``` <details> <summary>or if you are using SSH</summary> ``` git push git@github.com:dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11 ``` </details> After PR checks are complete push the branch ``` git push ``` ## Instructions for resolving conflicts :warning: If there are merge conflicts, you will need to resolve them manually before merging. You can do this [using GitHub][resolve-github] or using the [command line][resolve-cli]. [resolve-github]: https://help.github.com/articles/resolving-a-merge-conflict-on-github/ [resolve-cli]: https://help.github.com/articles/resolving-a-merge-conflict-using-the-command-line/ ## Instructions for updating this pull request Contributors to this repo have permission update this pull request by pushing to the branch 'merge/vs17.10-to-vs17.11'. 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. ``` git fetch git checkout -b merge/vs17.10-to-vs17.11 origin/vs17.11 git pull https://github.com/dotnet/msbuild merge/vs17.10-to-vs17.11 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/vs17.10-to-vs17.11 origin/vs17.11 git pull git@github.com:dotnet/msbuild merge/vs17.10-to-vs17.11 (make changes) git commit -m "Updated PR with my changes" git push git@github.com:dotnet/msbuild HEAD:merge/vs17.10-to-vs17.11 ``` </details> 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.
GangWang01
approved these changes
Feb 26, 2025
JanProvaznik
approved these changes
Feb 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 vs17.12 branch which have not been merged yet to vs17.13. I'm a robot and am configured to help you automatically keep vs17.13 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-vs17.13'. 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.