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

github-actions · 2025-10-17T16:50:26Z

I detected changes in the vs17.14 branch which have not been merged yet to vs18.0. I'm a robot and am configured to help you automatically keep vs18.0 up to date, so I've opened this PR.

This PR merges commits made on vs17.14 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.14
git pull --ff-only
git checkout vs18.0
git pull --ff-only
git merge --no-ff vs17.14

# 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.14-to-vs18.0

or if you are using SSH

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

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

or if you are using SSH

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

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**: [20250905.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2787027) ([282118](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/282118)) - **Date Produced**: September 5, 2025 2:36:46 PM UTC - **Commit**: [09625cb3b98ebe646a63dfea19a0c0127e88459a](dotnet/arcade@09625cb) - **Branch**: [release/8.0](https://github.com/dotnet/arcade/tree/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.0-beta.25427.4 to 8.0.0-beta.25455.3][1] - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@6e78cc9...09625cb [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 <v-gaw@microsoft.com>

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**: [20250905.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2787027) ([282118](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/282118)) - **Date Produced**: September 5, 2025 2:36:46 PM UTC - **Commit**: [09625cb3b98ebe646a63dfea19a0c0127e88459a](dotnet/arcade@09625cb) - **Branch**: [release/8.0](https://github.com/dotnet/arcade/tree/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.0-beta.25427.4 to 8.0.0-beta.25455.3][1] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@6e78cc9...09625cb [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 <v-gaw@microsoft.com>

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**: [20250905.3](https://dev.azure.com/dnceng/internal/_build/results?buildId=2787027) ([282118](https://maestro.dot.net/channel/3885/github:dotnet:arcade/build/282118)) - **Date Produced**: September 5, 2025 2:36:46 PM UTC - **Commit**: [09625cb3b98ebe646a63dfea19a0c0127e88459a](dotnet/arcade@09625cb) - **Branch**: [release/8.0](https://github.com/dotnet/arcade/tree/release/8.0) [DependencyUpdate]: <> (Begin) - **Updates**: - From [8.0.0-beta.25427.4 to 8.0.0-beta.25455.3][1] - Microsoft.SourceBuild.Intermediate.arcade - Microsoft.DotNet.Arcade.Sdk - Microsoft.DotNet.XUnitExtensions [1]: dotnet/arcade@6e78cc9...09625cb [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 <v-gaw@microsoft.com>

…bdirectory on every build Recreate temp on linux using CreateTempSubdirectory on every build ---- #### AI description (iteration 1) #### PR Classification Bug fix addressing a Linux-specific temporary folder security vulnerability. #### PR Summary This pull request enhances security in MSBuild on Linux by replacing the manual temporary folder creation logic with a reliable call to CreateTempSubdirectory, ensuring a unique and correctly set up temp folder on every build. - `src/Shared/TempFileUtilities.cs`: On Linux, the temp folder is now recreated via Directory.CreateTempSubdirectory instead of custom mkdir/chmod logic. - `src/Shared/TempFileUtilities.cs`: Removed the unused `userRWX` constant, cleaning up the code.  ---- #### AI description (iteration 2) #### PR Classification This pull request is a security fix that updates the temporary folder creation mechanism on Linux. #### PR Summary The PR replaces the insecure native mkdir/chmod approach with a safer Directory.CreateTempSubdirectory method for Linux, ensuring that the temporary folder is freshly created on every build and addressing the risk of malicious folder creation. - **`src/Shared/TempFileUtilities.cs`**: Replaces the complex mkdir/chmod logic with a call to Directory.CreateTempSubdirectory for Linux and removes the obsolete userRWX constant. - **`eng/Versions.props`**: Increments the version prefix to reflect the update. Related work items: #2541147

…directory on every build Recreate temp on linux using CreateTempSubdirectory on every build ---- #### AI description (iteration 1) #### PR Classification This pull request implements a security bug fix by revising the temporary folder creation mechanism on Linux. #### PR Summary The changes modify the creation of the MSBuild temporary folder to use .NET’s built-in Directory.CreateTempSubdirectory method on Linux, ensuring a new subdirectory is recreated on every build. This approach removes the custom native permission logic and fallback routines, thereby mitigating the risk of malicious folder creation. - `src/Shared/TempFileUtilities.cs`: On Linux, the manual mkdir/chmod logic is replaced with Directory.CreateTempSubdirectory using a fixed prefix. - `src/Shared/TempFileUtilities.cs`: For other platforms, the temporary path is now combined with the new folder prefix with explicit directory creation. - `src/Shared/TempFileUtilities.cs`: The custom permission constant (`userRWX`) is removed in favor of secure, built-in directory handling.  ---- #### AI description (iteration 2) #### PR Classification This pull request is a security fix addressing a vulnerability in the MSBuild temporary folder creation on Linux. #### PR Summary This pull request mitigates a security issue by revising the Linux temporary folder creation process to use a secure subdirectory creation method. - **`src/Shared/TempFileUtilities.cs`**: Refactored the Linux branch to create a temporary folder with `Directory.CreateTempSubdirectory` using a designated prefix, removing unsafe custom permission checks. - **`eng/Versions.props`**: Updated the version prefix from 17.8.42 to 17.8.43. Related work items: #2541147

…bdirectory on every build Recreate temp on linux using CreateTempSubdirectory on every build ---- #### AI description (iteration 1) #### PR Classification Security bug fix addressing the temporary folder creation issue on Linux. #### PR Summary This pull request secures the temporary directory creation in `src/Shared/TempFileUtilities.cs` by replacing the manual folder creation and permission checks with a call to `Directory.CreateTempSubdirectory` on Linux, thereby mitigating the risk of unauthorized temp folder creation. It directly addresses the linked [Security] work item by eliminating the potential for malicious actor intervention. - `src/Shared/TempFileUtilities.cs`: Uses `Directory.CreateTempSubdirectory` to create a unique, secure temp folder on Linux. - `src/Shared/TempFileUtilities.cs`: Removes outdated manual permission and folder collision handling logic.  ---- #### AI description (iteration 2) #### PR Classification Security bug fix that addresses a vulnerability in temporary folder creation on Linux. #### PR Summary This pull request enhances security by reworking the Linux temporary folder creation in MSBuild to generate a fresh subdirectory on every build using `Directory.CreateTempSubdirectory`. - `src/Shared/TempFileUtilities.cs`: Replaced the custom folder creation and permission logic with a secure, native subdirectory creation method and removed the obsolete `userRWX` constant. - `eng/Versions.props`: Bumped the version prefix from 17.11.47 to 17.11.48. Related work items: #2541147

…bdirectory on every build Recreate temp on linux using CreateTempSubdirectory on every build ---- #### AI description (iteration 2) #### PR Classification This PR is a security fix addressing vulnerabilities in temporary folder creation on Linux. #### PR Summary The PR revises the MSBuild temporary folder creation by replacing custom mkdir/chmod logic with a secure API call to Directory.CreateTempSubdirectory on Linux, mitigating risks of malicious folder pre-creation. It also bumps the package version. - `src/Shared/TempFileUtilities.cs`: Replaces custom Linux temp folder creation logic with a call to Directory.CreateTempSubdirectory and adjusts the fallback branch. - `src/Shared/TempFileUtilities.cs`: Removes the obsolete userRWX constant. - `eng/Versions.props`: Updates the version prefix from 17.12.49 to 17.12.50.  Related work items: #2541147

…bdirectory on every build Recreate temp on linux using CreateTempSubdirectory on every build ---- #### AI description (iteration 1) #### PR Classification Security bug fix that improves the creation of the temporary folder on Linux to prevent potential malicious folder hijacking. #### PR Summary This PR replaces the custom logic for creating and validating the MSBuild temporary folder on Linux with the built-in Directory.CreateTempSubdirectory method, ensuring a fresh and securely generated temp directory on every build. - `src/Shared/TempFileUtilities.cs`: Updated the Linux branch in the CreateFolderUnderTemp method to use Directory.CreateTempSubdirectory instead of manually handling mkdir/chmod and username concatenation. - `src/Shared/TempFileUtilities.cs`: Removed the custom permission logic and the unused `userRWX` constant, simplifying the directory creation for non-Linux platforms.  ---- #### AI description (iteration 2) #### PR Classification This pull request is a security bug fix addressing a vulnerability in how MSBuild creates its temporary folder on Linux. #### PR Summary The PR improves the security of temp folder creation by replacing custom mkdir/chmod logic with the built-in `Directory.CreateTempSubdirectory` on Linux, ensuring a uniquely created directory for each build. Additionally, it removes redundant permission code in `TempFileUtilities.cs` and bumps the version in `eng/Versions.props` from 17.14.27 to 17.14.28. - `src/Shared/TempFileUtilities.cs`: Replaces manual Linux temp folder creation with `Directory.CreateTempSubdirectory` and eliminates outdated permission checks. - `eng/Versions.props`: Updates the version prefix to signal the new release. Related work items: #2541147

Merging tag v17.8.43 into vs17.8 branch

Merging tag v17.10.46 into vs17.10 branch

Merging tag v17.12.50 into vs17.12 branch

Merging tag v17.14.28 into vs17.14 branch

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 Provazník <janprovaznik@microsoft.com>

github-actions · 2025-10-20T09:35:44Z

This pull request has been updated.

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

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 Provazník <janprovaznik@microsoft.com>

Co-authored-by: Jan Provazník <janprovaznik@microsoft.com>

github-actions · 2025-10-20T11:32:37Z

This pull request has been updated.

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

github-actions · 2025-10-20T15:26:43Z

This pull request has been updated.

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

.vsts-dotnet.yml

JanProvaznik · 2025-10-20T15:32:48Z

@rainersigwald also merge with no bump?

rainersigwald · 2025-10-20T15:44:15Z

Yes, makes sense to me. Will do so after the tests complete

dotnet-maestro bot and others added 16 commits September 8, 2025 09:11

Merge v17.10.46 into vs17.10

cbe8df0

Merge v17.11.48 into vs17.11

9a504bc

Merge v17.12.50 into vs17.12

3afee21

Merge v17.14.28 into vs17.14

f89a133

[vs17.8] Merge v17.8.43 into vs17.8 (#12646)

6be7d75

Merging tag v17.8.43 into vs17.8 branch

[vs17.10] Merge v17.10.46 into vs17.10 (#12647)

49570e4

Merging tag v17.10.46 into vs17.10 branch

[vs17.12] Merge v17.12.50 into vs17.12 (#12649)

465c458

Merging tag v17.12.50 into vs17.12 branch

[vs17.14] Merge v17.14.28 into vs17.14 (#12650)

b5618cb

Merging tag v17.14.28 into vs17.14 branch

github-actions bot requested a review from a team as a code owner October 17, 2025 16:50

rainersigwald assigned JanProvaznik Oct 17, 2025

JanProvaznik and others added 6 commits October 20, 2025 10:01

[vs17.11] Merge v17.11.48 into vs17.11 (#12648)

cdfe9a7

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

8e9a4ba

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 Provazník <janprovaznik@microsoft.com>

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

fa28cac

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 Provazník <janprovaznik@microsoft.com>

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

c3bf5aa

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

f7ee510

[vs17.14] Update dependencies from dotnet/arcade (#12517)

7457a57

dotnet-maestro bot and others added 5 commits October 20, 2025 09:39

[vs17.12] Update dependencies from dotnet/arcade (#12518)

675b209

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 Provazník <janprovaznik@microsoft.com>

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

7ed9cf3

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

1656215

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

155d42e

Disable localization for vs17.14 (#12619)

3c92f20

Co-authored-by: Jan Provazník <janprovaznik@microsoft.com>

JanProvaznik added 4 commits October 20, 2025 13:41

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

61706fe

[automated] Merge branch 'vs17.11' => 'vs17.12' (#12675)

2681ee4

Merge branch 'vs17.14' into merge/vs17.12-to-vs17.14

f527f0e

[automated] Merge branch 'vs17.12' => 'vs17.14' (#12666)

90160d4

Merge branch 'vs18.0' into merge/vs17.14-to-vs18.0

73796e6

JanProvaznik reviewed Oct 20, 2025

View reviewed changes

.vsts-dotnet.yml Outdated Show resolved Hide resolved

fix merge of loc config

3a597e5

JanProvaznik approved these changes Oct 20, 2025

View reviewed changes

JanProvaznik enabled auto-merge October 20, 2025 15:32

rainersigwald mentioned this pull request Oct 20, 2025

Test crash in TaskHostFactory_Tests.TaskNodesDieAfterBuild #12683

Closed

rainersigwald disabled auto-merge October 20, 2025 20:10

rainersigwald merged commit 494d3f9 into vs18.0 Oct 20, 2025
8 of 10 checks passed

rainersigwald deleted the merge/vs17.14-to-vs18.0 branch October 20, 2025 20:11

This was referenced Oct 21, 2025

[release/10.0.1xx] Source code updates from dotnet/msbuild dotnet/dotnet#3016

Merged

[release/10.0.2xx] Source code updates from dotnet/msbuild dotnet/dotnet#3001

Merged

[main] Source code updates from dotnet/msbuild dotnet/dotnet#3029

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[automated] Merge branch 'vs17.14' => 'vs18.0'#12667

[automated] Merge branch 'vs17.14' => 'vs18.0'#12667
rainersigwald merged 33 commits intovs18.0from
merge/vs17.14-to-vs18.0

github-actions bot commented Oct 17, 2025

Uh oh!

github-actions bot commented Oct 20, 2025

Uh oh!

github-actions bot commented Oct 20, 2025

Uh oh!

github-actions bot commented Oct 20, 2025

Uh oh!

Uh oh!

JanProvaznik commented Oct 20, 2025

Uh oh!

rainersigwald commented Oct 20, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

github-actions bot commented Oct 17, 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 Oct 20, 2025

Uh oh!

github-actions bot commented Oct 20, 2025

Uh oh!

github-actions bot commented Oct 20, 2025

Uh oh!

Uh oh!

JanProvaznik commented Oct 20, 2025

Uh oh!

rainersigwald commented Oct 20, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants