[automated] Merge branch 'vs17.11' => 'vs17.12' #12487

github-actions · 2025-09-03T02:45:01Z

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.

git fetch
git checkout vs17.11
git pull --ff-only
git checkout vs17.12
git pull --ff-only
git merge --no-ff vs17.11

# 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.11-to-vs17.12

or if you are using SSH

git push [email protected]:dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12

After PR checks are complete push the branch

git push

Instructions for resolving conflicts

⚠️ If there are merge conflicts, you will need to resolve them manually before merging. You can do this using GitHub or 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.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.

git fetch
git checkout -b merge/vs17.11-to-vs17.12 origin/vs17.12
git pull https://github.com/dotnet/msbuild merge/vs17.11-to-vs17.12
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12

or if you are using SSH

git fetch
git checkout -b merge/vs17.11-to-vs17.12 origin/vs17.12
git pull [email protected]:dotnet/msbuild merge/vs17.11-to-vs17.12
(make changes)
git commit -m "Updated PR with my changes"
git push [email protected]:dotnet/msbuild HEAD:merge/vs17.11-to-vs17.12

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.

…nse headers DownloadFile should not rely on the remote server response headers. Unless the DestinationFileName task parameter is specified - let's just fallback to the request URI - which is as well the publicly documented behavior ---- #### AI description (iteration 2) #### PR Classification Bug fix #### PR Summary This pull request updates the `DownloadFile` task to avoid relying on response headers for determining the file name. - `src/Tasks/DownloadFile.cs`: Modified `TryGetFileName` method to use the request URI instead of the response headers to determine the file name. Updated method calls accordingly.

…vDiv/_git/DotNet-msbuild-Trusted into internal/vs16.11

Fixes # ### Context ### Changes Made ### Testing ### Notes

* Update dependencies from https://github.com/dotnet/arcade build 20250610.3 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25264.2 -> To Version 8.0.0-beta.25310.3 * Update VersionPrefix to 17.8.31 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]>

* Update dependencies from https://github.com/dotnet/arcade build 20250610.3 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25264.2 -> To Version 8.0.0-beta.25310.3 * Update VersionPrefix to 17.10.32 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]>

* Update dependencies from https://github.com/dotnet/arcade build 20250626.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25326.1 * Update VersionPrefix for 17.8 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Nguyen Huu Linh <[email protected]>

* Update dependencies from https://github.com/dotnet/arcade build 20250626.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25310.3 -> To Version 8.0.0-beta.25326.1 * Update VersionPrefix for vs17.10 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Nguyen Huu Linh <[email protected]>

This pull request updates the following dependencies [marker]: <> (Begin:42961865-e7dd-40be-a923-7af2e4664f80) ## From https://github.com/dotnet/arcade - **Subscription**: [42961865-e7dd-40be-a923-7af2e4664f80](https://maestro.dot.net/subscriptions?search=42961865-e7dd-40be-a923-7af2e4664f80) - **Build**: [20250716.2](https://dev.azure.com/dnceng/internal/_build/results?buildId=2751532) - **Date Produced**: July 16, 2025 7:28:41 PM UTC - **Commit**: [a73c08ec0de5a6e5e2a8668837df67edecb3a3da](dotnet/arcade@a73c08e) - **Branch**: refs/heads/release/8.0 [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.0-beta.25326.1 to 8.0.0-beta.25366.2][1] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@6e3320b...a73c08e [DependencyUpdate]: <> (End) [marker]: <> (End:42961865-e7dd-40be-a923-7af2e4664f80) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: YuliiaKovalova <[email protected]>

This pull request updates the following dependencies [marker]: <> (Begin:42961865-e7dd-40be-a923-7af2e4664f80) ## From https://github.com/dotnet/arcade - **Subscription**: [42961865-e7dd-40be-a923-7af2e4664f80](https://maestro.dot.net/subscriptions?search=42961865-e7dd-40be-a923-7af2e4664f80) - **Build**: [20250728.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2759925) - **Date Produced**: July 28, 2025 7:56:32 PM UTC - **Commit**: [8dca4f8ae100b102230287f8cc1b75264c9f1a6f](dotnet/arcade@8dca4f8) - **Branch**: [release/8.0](https://github.com/dotnet/arcade/tree/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.0-beta.25366.2 to 8.0.0-beta.25378.1][1] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@a73c08e...8dca4f8 [DependencyUpdate]: <> (End) [marker]: <> (End:42961865-e7dd-40be-a923-7af2e4664f80) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: huulinh99 <[email protected]>

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](https://maestro.dot.net/subscriptions?search=aca86521-13b3-4d28-a005-127af3b681e5) - **Build**: [20250728.1](https://dev.azure.com/dnceng/internal/_build/results?buildId=2759925) - **Date Produced**: July 28, 2025 7:56:32 PM UTC - **Commit**: [8dca4f8ae100b102230287f8cc1b75264c9f1a6f](dotnet/arcade@8dca4f8) - **Branch**: [release/8.0](https://github.com/dotnet/arcade/tree/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.0-beta.25366.2 to 8.0.0-beta.25378.1][1] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@a73c08e...8dca4f8 [DependencyUpdate]: <> (End) [marker]: <> (End:aca86521-13b3-4d28-a005-127af3b681e5) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: huulinh99 <[email protected]>

@GangWang01

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: * @GangWang01 * @dotnet-maestro[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 [email protected]: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 [email protected]:dotnet/msbuild merge/vs17.8-to-vs17.10 (make changes) git commit -m "Updated PR with my changes" git push [email protected]: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. --------- Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]> Co-authored-by: Nguyen Huu Linh <[email protected]>

Update version of package in PrebuiltBaseline for resolve the issue in internal build pipeline

@JanProvaznik

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: * @JanProvaznik * @YuliiaKovalova * @github-actions[bot] * @dotnet-maestro[bot] * @GangWang01 ## 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 [email protected]: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 [email protected]:dotnet/msbuild merge/vs17.10-to-vs17.11 (make changes) git commit -m "Updated PR with my changes" git push [email protected]: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. --------- Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]> Co-authored-by: Nguyen Huu Linh <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: huulinh99 <[email protected]> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: YuliiaKovalova <[email protected]> Co-authored-by: Jan Provazník <[email protected]>

Co-authored-by: Jan Provazník <[email protected]> Co-authored-by: Copilot <[email protected]>

This pull request updates the following dependencies [marker]: <> (Begin:42961865-e7dd-40be-a923-7af2e4664f80) ## From https://github.com/dotnet/arcade - **Subscription**: [42961865-e7dd-40be-a923-7af2e4664f80](https://maestro.dot.net/subscriptions?search=42961865-e7dd-40be-a923-7af2e4664f80) - **Build**: [20250827.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2781392) - **Date Produced**: August 27, 2025 10:24:08 PM UTC - **Commit**: [6e78cc9faf0ab29992b01007d71519655344e74c](dotnet/arcade@6e78cc9) - **Branch**: [release/8.0](https://github.com/dotnet/arcade/tree/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.0-beta.25422.2 to 8.0.0-beta.25427.4][1] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@3e8ada7...6e78cc9 [DependencyUpdate]: <> (End) [marker]: <> (End:42961865-e7dd-40be-a923-7af2e4664f80) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]>

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](https://maestro.dot.net/subscriptions?search=aca86521-13b3-4d28-a005-127af3b681e5) - **Build**: [20250827.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2781392) - **Date Produced**: August 27, 2025 10:24:08 PM UTC - **Commit**: [6e78cc9faf0ab29992b01007d71519655344e74c](dotnet/arcade@6e78cc9) - **Branch**: [release/8.0](https://github.com/dotnet/arcade/tree/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.0-beta.25422.2 to 8.0.0-beta.25427.4][1] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@3e8ada7...6e78cc9 [DependencyUpdate]: <> (End) [marker]: <> (End:aca86521-13b3-4d28-a005-127af3b681e5) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]>

@YuliiaKovalova

I detected changes in the vs16.11 branch which have not been merged yet to vs17.8. I'm a robot and am configured to help you automatically keep vs17.8 up to date, so I've opened this PR. This PR merges commits made on vs16.11 by the following committers: * @YuliiaKovalova * @GangWang01 * @huulinhnguyen-dev * @dotnet-maestro[bot] * @rainersigwald * @surayya-MS * @maridematte ## 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 vs16.11 git pull --ff-only git checkout vs17.8 git pull --ff-only git merge --no-ff vs16.11 # 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/vs16.11-to-vs17.8 ``` <details> <summary>or if you are using SSH</summary> ``` git push [email protected]:dotnet/msbuild HEAD:merge/vs16.11-to-vs17.8 ``` </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/vs16.11-to-vs17.8'. 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/vs16.11-to-vs17.8 origin/vs17.8 git pull https://github.com/dotnet/msbuild merge/vs16.11-to-vs17.8 (make changes) git commit -m "Updated PR with my changes" git push https://github.com/dotnet/msbuild HEAD:merge/vs16.11-to-vs17.8 ``` <details> <summary>or if you are using SSH</summary> ``` git fetch git checkout -b merge/vs16.11-to-vs17.8 origin/vs17.8 git pull [email protected]:dotnet/msbuild merge/vs16.11-to-vs17.8 (make changes) git commit -m "Updated PR with my changes" git push [email protected]:dotnet/msbuild HEAD:merge/vs16.11-to-vs17.8 ``` </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.

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](https://maestro.dot.net/subscriptions?search=5f9c9524-456b-43ca-a978-063daaf53c38) - **Build**: [20250827.4](https://dev.azure.com/dnceng/internal/_build/results?buildId=2781392) - **Date Produced**: August 27, 2025 10:24:08 PM UTC - **Commit**: [6e78cc9faf0ab29992b01007d71519655344e74c](dotnet/arcade@6e78cc9) - **Branch**: [release/8.0](https://github.com/dotnet/arcade/tree/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.0-beta.25422.2 to 8.0.0-beta.25427.4][1] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@3e8ada7...6e78cc9 [DependencyUpdate]: <> (End) - **Updates to .NET SDKs:** - Updates tools.dotnet to 8.0.119 [marker]: <> (End:5f9c9524-456b-43ca-a978-063daaf53c38) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]>

@dotnet-maestro

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: * @dotnet-maestro[bot] * @JanProvaznik * @YuliiaKovalova * @github-actions[bot] * @GangWang01 ## 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 [email protected]: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 [email protected]:dotnet/msbuild merge/vs17.10-to-vs17.11 (make changes) git commit -m "Updated PR with my changes" git push [email protected]: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.

maridematte and others added 30 commits April 22, 2025 11:08

Onboard 1es templates (#11658)

a3758c2

Bump the version to 16.11.4

e0aa4c9

Fix opt prof file

a1378c6

Added vs-insertion-experimental.yml

715323b

remove Microsoft.Build.Arm64.vsman

a0e183f

Remove Arm64VSManPath entry

d33c53e

Added vs-insertion.yml

0c78574

bump StringTools version

c8bc931

Merge branch 'internal/vs16.11' of https://devdiv.visualstudio.com/De…

ece6564

…vDiv/_git/DotNet-msbuild-Trusted into internal/vs16.11

bump the version

6c23463

undo string tools version updates

a918ceb

[vs16.11] Merge tag v16.11.6 (#11871)

99cbab0

Fixes # ### Context ### Changes Made ### Testing ### Notes

Bump to NuGet 5.11.6 (#12168)

bee76da

Update version of package in PrebuiltBaseline to 5.11.6 (#12173)

4921021

[vs17.8] Update dependencies from dotnet/arcade (#12200)

9cec38a

[vs17.11] Update dependencies from dotnet/arcade (#12202)

1ee0c71

[vs17.8] Update dependencies from dotnet/arcade (#12271)

a0194b4

[vs16.11] Update dependencies from dotnet/arcade (#12295)

63afb06

[vs17.8] Recover bootstrap and corresponding disabled tests (#12294)

fe4b4c2

[vs17.10] Recover bootstrap and corresponding disabled tests (#12293)

b8adc52

Update version of packages in PrebuiltBaseline (#12304)

3e726cb

Update version of package in PrebuiltBaseline for resolve the issue in internal build pipeline

YuliiaKovalova and others added 20 commits August 27, 2025 17:27

merge adjustments

80c08e0

[automated] Merge branch 'vs17.8' => 'vs17.10' (#12441)

550b208

[vs16.11] Disable opt prof (#12453)

6289910

Add signtype to parameters (#12466)

8bab15e

Co-authored-by: Jan Provazník <[email protected]> Co-authored-by: Copilot <[email protected]>

[vs16.11] Backport experimental build pipeline changes (#12476)

d2a4db0

Merge branch 'vs17.8' into merge/vs16.11-to-vs17.8

3f00201

Revert undesired changes

c98d87e

Update VersionPrefix to 17.8.40

43b0295

Merge branch 'vs17.10' into merge/vs17.8-to-vs17.10

3156144

Update VersionPrefix to 17.10.44

f7dcb22

[automated] Merge branch 'vs17.8' => 'vs17.10' (#12482)

3056f1f

Merge branch 'vs17.11' into merge/vs17.10-to-vs17.11

434e6d0

Revert undesired change

7050fcf

Update VersionPrefix to 17.11.46

c987209

github-actions bot requested a review from a team as a code owner September 3, 2025 02:45

huulinhnguyen-dev added 4 commits September 3, 2025 10:23

Resolve conflicts

fa82349

Bump the versions

f43097f

Remove artifacts\bin in .vsts-dotnet-build-jobs.yml

b7e3dd2

Added missed code in Versions.props

ea52aed

GangWang01 approved these changes Sep 3, 2025

View reviewed changes

JanProvaznik enabled auto-merge September 3, 2025 09:17

JanProvaznik approved these changes Sep 3, 2025

View reviewed changes

JanProvaznik merged commit 6be9954 into vs17.12 Sep 3, 2025
10 checks passed

JanProvaznik deleted the merge/vs17.11-to-vs17.12 branch September 3, 2025 09:17

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[automated] Merge branch 'vs17.11' => 'vs17.12' #12487

[automated] Merge branch 'vs17.11' => 'vs17.12' #12487

Uh oh!

github-actions bot commented Sep 3, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

[automated] Merge branch 'vs17.11' => 'vs17.12' #12487

[automated] Merge branch 'vs17.11' => 'vs17.12' #12487

Uh oh!

Conversation

github-actions bot commented Sep 3, 2025

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants