[automated] Merge branch 'vs17.12' => 'vs17.14' by github-actions[bot] · Pull Request #11991 · dotnet/msbuild

github-actions · 2025-06-11T11:26:07Z

I detected changes in the vs17.12 branch which have not been merged yet to vs17.14. I'm a robot and am configured to help you automatically keep vs17.14 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.

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

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

or if you are using SSH

git push git@github.com:dotnet/msbuild HEAD:merge/vs17.12-to-vs17.14

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.12-to-vs17.14'. 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.12-to-vs17.14 origin/vs17.14
git pull https://github.com/dotnet/msbuild merge/vs17.12-to-vs17.14
(make changes)
git commit -m "Updated PR with my changes"
git push https://github.com/dotnet/msbuild HEAD:merge/vs17.12-to-vs17.14

or if you are using SSH

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

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 <v-jennybai@microsoft.com>

* Update dependencies from https://github.com/dotnet/arcade build 20250311.4 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25161.4 * Update Versions.props VersionPrefix * Update dependencies from https://github.com/dotnet/arcade build 20250314.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25111.5 -> To Version 9.0.0-beta.25164.2 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>

Co-authored-by: Rainer Sigwald <raines@microsoft.com>

* 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.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.25164.5 -> To Version 8.0.0-beta.25204.7 * Update Versions.props --------- 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 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 <v-jennybai@microsoft.com> Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>

* Update dependencies from https://github.com/dotnet/arcade build 20250404.5 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25164.2 -> To Version 9.0.0-beta.25204.5 * Update Versions.props VersionPrefix --------- 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 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 <v-gaw@microsoft.com>

* 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 <v-gaw@microsoft.com>

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.

…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 1) #### PR Classification Bug fix to ensure `DownloadFile` does not rely on response headers for file name determination. #### PR Summary This pull request modifies the `DownloadFile` task to avoid using response headers for determining the file name, instead relying on the request URI. - Changes in `src/Tasks/DownloadFile.cs` to use `requestUri` instead of `response` for file name extraction. - Updated method signature and logic in `TryGetFileName` to handle `requestUri`.

…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 1) #### PR Classification Bug fix #### PR Summary This pull request updates the `DownloadFile` task to avoid relying on response headers for determining the file name, instead using the request URI. - Changes in `src/Tasks/DownloadFile.cs` to use `requestUri` instead of `response` for file name determination. - Modified method signature and logic in `TryGetFileName` to use `requestUri`. - Updated call to `TryGetFileName` to pass `uri` instead of `response`.

* 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.11.31 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com>

…-vs17.11

…-vs17.12

* Update dependencies from https://github.com/dotnet/arcade build 20250602.2 Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.25271.1 -> To Version 9.0.0-beta.25302.2 * Update VersionPrefix to 17.12.39 --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Gang Wang <v-gaw@microsoft.com>

Conflicts: .vsts-dotnet.yml azure-pipelines/vs-insertion-experimental.yml eng/Versions.props

AR-May · 2025-06-12T13:33:35Z

/azp run

azure-pipelines · 2025-06-12T13:33:46Z

Azure Pipelines successfully started running 1 pipeline(s).

AR-May · 2025-06-12T16:14:42Z

Looked at the error: dotnet-install cannot find the version 9.0.200-preview.0.24603.3 for osx arm64 - this version seems to be missing on the resolved locations.

AR-May · 2025-06-13T12:23:30Z

/azp run

azure-pipelines · 2025-06-13T12:23:40Z

Azure Pipelines successfully started running 1 pipeline(s).

AR-May · 2025-06-13T12:27:30Z

Can not reproduce the failure locally anymore today - maybe it was some outage. Re-running tests.

eng/Version.Details.xml

global.json

Co-authored-by: Rainer Sigwald <raines@microsoft.com>

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

Contention condition reproduction via unit test

fcd04a1

updating the lists only after they're complete to avoid the contention.

e8a0328

Update src/Build/BackEnd/Components/SdkResolution/SdkResolverService.cs

37048d6

Co-authored-by: Rainer Sigwald <raines@microsoft.com>

addressing review comments

5de4f3e

minor touchup

5488c7b

#if DEBUG fix

802facb

refactoring to get rid of #if directives

14850f3

removing unnecessary include

ce5dc26

variable rename

39aadf9

Update Versions.props to 17.12.34

ebddc30

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

[automated] Merge branch 'vs17.10' => 'vs17.11' (#11687)

e8f3d27

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

rainersigwald and others added 3 commits June 6, 2025 09:44

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

adc7800

…-vs17.11

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

6c6276d

…-vs17.12

github-actions bot requested a review from a team as a code owner June 11, 2025 11:26

Merge branch vs17.12 into vs17.14

05c6da6

Conflicts: .vsts-dotnet.yml azure-pipelines/vs-insertion-experimental.yml eng/Versions.props

rainersigwald assigned AR-May Jun 11, 2025

AR-May approved these changes Jun 12, 2025

View reviewed changes

Update bootstrap SDK version.

5351f21

AR-May force-pushed the merge/vs17.12-to-vs17.14 branch from 04806d5 to 5351f21 Compare June 13, 2025 15:10

Suppress IDE0040, IDE0051, IDE0052, IDE0350 warnings

6e830f9

AR-May force-pushed the merge/vs17.12-to-vs17.14 branch from 58abbbb to 6e830f9 Compare June 13, 2025 15:43

rainersigwald approved these changes Jun 13, 2025

View reviewed changes

eng/Version.Details.xml Show resolved Hide resolved

global.json Outdated Show resolved Hide resolved

Update global.json

ae6ec24

Co-authored-by: Rainer Sigwald <raines@microsoft.com>

rainersigwald merged commit 65391c5 into vs17.14 Jun 13, 2025
10 checks passed

rainersigwald deleted the merge/vs17.12-to-vs17.14 branch June 13, 2025 21:39

AR-May mentioned this pull request Jun 17, 2025

[vs17.14] Update dependencies from dotnet/arcade #12005

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'vs17.12' => 'vs17.14'#11991

[automated] Merge branch 'vs17.12' => 'vs17.14'#11991
rainersigwald merged 63 commits intovs17.14from
merge/vs17.12-to-vs17.14

github-actions bot commented Jun 11, 2025

Uh oh!

AR-May commented Jun 12, 2025

Uh oh!

azure-pipelines bot commented Jun 12, 2025

Uh oh!

AR-May commented Jun 12, 2025

Uh oh!

AR-May commented Jun 13, 2025

Uh oh!

azure-pipelines bot commented Jun 13, 2025

Uh oh!

AR-May commented Jun 13, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

Conversation

github-actions bot commented Jun 11, 2025

Instructions for merging from UI

Instructions for merging via command line

Instructions for resolving conflicts

Instructions for updating this pull request

Uh oh!

AR-May commented Jun 12, 2025

Uh oh!

azure-pipelines bot commented Jun 12, 2025

Uh oh!

AR-May commented Jun 12, 2025

Uh oh!

AR-May commented Jun 13, 2025

Uh oh!

azure-pipelines bot commented Jun 13, 2025

Uh oh!

AR-May commented Jun 13, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants