[automated] Merge branch 'vs17.10' => 'vs17.11' #11905

github-actions · 2025-05-26T08:47:43Z

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:

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.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

or if you are using SSH

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

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.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

or if you are using SSH

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

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 20250220.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25114.5 -> To Version 8.0.0-beta.25120.1 * Update Versions.props VersionPrefix * Update dependencies from https://github.com/dotnet/arcade build 20250314.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25114.5 -> To Version 8.0.0-beta.25164.5 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <[email protected]>

* remove release branding for experimental in CI Build * backport experimental insertion and add servicing branch selection logic * fix removing versionkind * bump version * simplify version suffix selection * fix comment

changes in the vs17.8 branch which have not been merged yet to vs17.10

* Update dependencies from https://github.com/dotnet/arcade build 20250404.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25111.4 -> To Version 8.0.0-beta.25204.7 * Update Versions.props VersionPrefix * Update PreReleaseVersionLabel to 'servicing' --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <[email protected]> Co-authored-by: YuliiaKovalova <[email protected]>

* Update dependencies from https://github.com/dotnet/arcade build 20250408.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25204.7 -> To Version 8.0.0-beta.25208.7 * Update VersionPrefix to 17.8.26 --------- 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 20250408.7 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25204.7 -> To Version 8.0.0-beta.25208.7 * Update VersionPrefix to 17.10.27 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]>

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.

revert 10725 to unblock VS insertions by matching 17.8 VS versions.

revert 10725 The test run: https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=11407655&view=results

We're doing a version bump so all branches have up-to-date opt-prof runs. [Opt-prof version](https://dev.azure.com/devdiv/_apps/hub/ms-vscs-artifact.build-tasks.drop-hub-group-explorer-hub?name=OptimizationData/DotNet-msbuild-Trusted/internal/vs17.8/20250416.5/11417138/1) ---- #### AI description (iteration 1) #### PR Classification Version update. #### PR Summary This pull request updates the version prefix in the project configuration. - `eng/Versions.props`: Updated `<VersionPrefix>` from `17.8.28` to `17.8.29`.

We're doing a version bump so all branches have up-to-date opt-prof runs. [OptProf data](https://dev.azure.com/devdiv/_apps/hub/ms-vscs-artifact.build-tasks.drop-hub-group-explorer-hub?name=OptimizationData/DotNet-msbuild-Trusted/internal/vs17.10/20250422.7/11449768/1) ---- #### AI description (iteration 1) #### PR Classification Version bump. #### PR Summary This pull request updates the version prefix in the project configuration file to reflect a new release version. - `eng/Versions.props`: Updated `<VersionPrefix>` from `17.10.28` to `17.10.29`.

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

* Update dependencies from https://github.com/dotnet/arcade build 20250414.7 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25214.7 * Update VersionPrefix to 17.8.27 * Update dependencies from https://github.com/dotnet/arcade build 20250425.5 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25225.5 * Update dependencies from https://github.com/dotnet/arcade build 20250430.1 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25230.1 * Update dependencies from https://github.com/dotnet/arcade build 20250513.4 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25263.4 * Update dependencies from https://github.com/dotnet/arcade build 20250514.2 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25264.2 * bump VersionPrefix to 17.8.30 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]>

* Update dependencies from https://github.com/dotnet/arcade build 20250414.7 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25214.7 * Update VersionPrefix to 17.10.28 * Update dependencies from https://github.com/dotnet/arcade build 20250425.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25225.5 * Update dependencies from https://github.com/dotnet/arcade build 20250430.1 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25230.1 * Update dependencies from https://github.com/dotnet/arcade build 20250513.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25263.4 * Update dependencies from https://github.com/dotnet/arcade build 20250514.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25208.7 -> To Version 8.0.0-beta.25264.2 * bump VersionPrefix to 17.10.30 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]> Co-authored-by: Surayya Huseyn Zada <[email protected]>

github-actions · 2025-05-28T01:39:24Z

This pull request has been updated.

This PR merges commits made on vs17.10 by the following committers:

@surayya-MS

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: * @surayya-MS * @rainersigwald * @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.

github-actions · 2025-05-30T11:52:30Z

This pull request has been updated.

This PR merges commits made on vs17.10 by the following committers:

…-vs17.11

dotnet-maestro bot and others added 24 commits March 18, 2025 09:11

Add the check on version bump up (#11469)

b46a62a

Update VersionPrefix to 17.10.25

6c0a39c

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

cf8fc7f

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

54a3d0c

changes in the vs17.8 branch which have not been merged yet to vs17.10

[vs17.10] Update dependencies from dotnet/arcade (#11693)

12f3204

[vs17.8] DownloadFile should not rely on the response headers

3ab07f0

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.

[vs17.10] DownloadFile should not rely on the response headers

b0cdc26

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.

[vs17.8] Revert to GA package references

0479d98

revert 10725 to unblock VS insertions by matching 17.8 VS versions.

Merged PR 628249: [vs17.10] revert 10725 (code QL fixes)

221b261

revert 10725 The test run: https://dev.azure.com/devdiv/DevDiv/_build/results?buildId=11407655&view=results

disable bootstrap

eb450c9

disable bootstrap

3b68347

skip failing tests after disabling bootstrap

80db04e

update ubuntu image

37f4df2

skip failing tests after disabling bootstrap

4a6df2d

update ubuntu image

b1d27f0

[vs17.8] Merge tag v17.8.29 (#11866)

2e2d89a

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

[vs17.10] Merge tag v17.10.29 (#11865)

fb90280

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

github-actions bot requested a review from a team as a code owner May 26, 2025 08:47

surayya-MS added the do-not-merge label May 26, 2025

dotnet-maestro bot and others added 2 commits May 28, 2025 09:38

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

bfb7771

surayya-MS and others added 2 commits May 30, 2025 12:49

bump VersionPrefix to 17.10.31

04101d3

surayya-MS force-pushed the merge/vs17.10-to-vs17.11 branch from 8d148cd to b6c2ecb Compare May 30, 2025 12:11

surayya-MS approved these changes Jun 6, 2025

View reviewed changes

Merge remote-tracking branch 'upstream/vs17.10' into merge/vs17.10-to…

adc7800

…-vs17.11

rainersigwald force-pushed the merge/vs17.10-to-vs17.11 branch from 809dbce to adc7800 Compare June 6, 2025 14:44

AR-May approved these changes Jun 6, 2025

View reviewed changes

AR-May removed the do-not-merge label Jun 6, 2025

rainersigwald merged commit adc7800 into vs17.11 Jun 6, 2025
4 of 10 checks passed

rainersigwald deleted the merge/vs17.10-to-vs17.11 branch June 6, 2025 14:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'vs17.10' => 'vs17.11' #11905

[automated] Merge branch 'vs17.10' => 'vs17.11' #11905

Uh oh!

github-actions bot commented May 26, 2025

Uh oh!

github-actions bot commented May 28, 2025

Uh oh!

github-actions bot commented May 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

[automated] Merge branch 'vs17.10' => 'vs17.11' #11905

[automated] Merge branch 'vs17.10' => 'vs17.11' #11905

Uh oh!

Conversation

github-actions bot commented May 26, 2025

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

github-actions bot commented May 28, 2025

Uh oh!

github-actions bot commented May 30, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants