Skip to content

Conversation

@github-actions
Copy link
Contributor

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.

merge button instructions

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 git@github.com: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 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

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 and others added 21 commits April 19, 2024 11:44
…o release branch or the change from dotnet bot
[vs17.10] Check version bump on release branches' update
* Dont ngen taskhost Fixes our lack of optprof data (#8737)

Don't ngen TaskHosts

* Bump version

* Bump version

* Update System.Security.Cryptography.Pkcs

* Bump version

* Workaround for incorrect encoding of PUA range in GB18030 Uri string (#9751)

* [release/vs17.7] Onboard 1es templates (#9924)

* bump arcade version

* bump MicrosoftNetCompilersToolsetVersion

* bump MicrosoftNetCompilersToolsetVersion

* update sha for Microsoft.Net.Compilers.Toolset

* update darc

* update arcade channel .net 8

* update arcade

* Changed pool image

---------

Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
Co-authored-by: sujitnayak <sujitn@microsoft.com>
Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <ykovalova@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com>
Co-authored-by: Mariana Dematte <magarces@microsoft.com>
Co-authored-by: Rainer Sigwald <raines@microsoft.com>
This PR enables MSBuild to take security fixes from MSBuild dependencies.
* Update dependencies from https://github.com/dotnet/arcade build 20241008.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24225.1 -> To Version 8.0.0-beta.24508.1

* Update Versions.props

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
* Bump Microsoft.IO.Redist to 6.0.1
* Bump System.Formats.Asn1 to 8.0.1
* Update dependencies from https://github.com/dotnet/arcade build 20241112.12

Microsoft.SourceBuild.Intermediate.arcade , 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.10.13

* Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4

* Revert "Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4"

This reverts commit 66381f3.

* Update dependencies from https://github.com/dotnet/arcade build 20241120.5

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24525.2 -> To Version 8.0.0-beta.24570.5

* Reapply "Try to resolve CI issue that could not find System.Text.Json, Version=8.0.0.4"

This reverts commit 2cffa88.

---------

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: Surayya Huseyn Zada <shuseynzada@microsoft.com>
* Dont ngen taskhost Fixes our lack of optprof data (#8737)

Don't ngen TaskHosts

* Bump version

* Bump version

* Update System.Security.Cryptography.Pkcs

* Bump version

* Workaround for incorrect encoding of PUA range in GB18030 Uri string (#9751)

* [release/vs17.7] Onboard 1es templates (#9924)

* bump arcade version

* bump MicrosoftNetCompilersToolsetVersion

* bump MicrosoftNetCompilersToolsetVersion

* update sha for Microsoft.Net.Compilers.Toolset

* CG alert cleaning on VS17.8 (#10725)

* 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

* [vs17.8] update arcade and fix build  (#10838)

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

* [vs17.8] Sync internal and public branches (#10858)

* Update dependencies from https://github.com/dotnet/arcade build 20241025.2 (#10894)

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

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

* Update dependencies from https://github.com/dotnet/arcade build 20241120.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5

* Update VersionPrefix to 17.8.12

* [vs17.8] Backport VS insertion pipeline YMLs (#11066)

Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>

* Update .opt-prof.yml (#11112)

* [vs17.8] Fix setting package versions in VS insertion (#11103)

* fix setting package versions

* use VS branch names in servicing package decision

---------

Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>

* Update vs/msbuild version (#11115)

* Update vs/msbuild version

* Bump version

* Update xcopy-msbuild version to 17.8.5 (#11118)

* Add inter-branch merge flow file (#11123)

* Update .opt-prof.yml (#11121)

* Bump up System.Text.Json to 8.0.5 (#11134)

* Remove the change to CompatibilitySuppressions.xml

* Remove unnecessary workaround for sdk 8.0.1xx bootstrap in the branch vs17.8

* Bump up version prefix to 17.10.14

---------

Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
Co-authored-by: sujitnayak <sujitn@microsoft.com>
Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <ykovalova@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@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: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>
* Update dependencies from https://github.com/dotnet/arcade build 20241223.2

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24570.5 -> To Version 8.0.0-beta.24623.2

* 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 20250110.1

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24623.2 -> To Version 8.0.0-beta.25060.1

* 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 .vsts-dotnet.yml

* Bump version

* Bump version

* Add comment for VisualStudio.ChannelName value

---------

Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz>
* Update dependencies from https://github.com/dotnet/arcade build 20250116.6

Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25066.6
* Dont ngen taskhost Fixes our lack of optprof data (#8737)

Don't ngen TaskHosts

* Bump version

* Bump version

* Update System.Security.Cryptography.Pkcs

* Bump version

* Workaround for incorrect encoding of PUA range in GB18030 Uri string (#9751)

* [release/vs17.7] Onboard 1es templates (#9924)

* bump arcade version

* bump MicrosoftNetCompilersToolsetVersion

* bump MicrosoftNetCompilersToolsetVersion

* update sha for Microsoft.Net.Compilers.Toolset

* CG alert cleaning on VS17.8 (#10725)

* 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

* [vs17.8] update arcade and fix build  (#10838)

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

* [vs17.8] Sync internal and public branches (#10858)

* Update dependencies from https://github.com/dotnet/arcade build 20241025.2 (#10894)

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

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

* Update dependencies from https://github.com/dotnet/arcade build 20241120.5

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24562.12 -> To Version 8.0.0-beta.24570.5

* Update VersionPrefix to 17.8.12

* [vs17.8] Backport VS insertion pipeline YMLs (#11066)

Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>

* Update .opt-prof.yml (#11112)

* [vs17.8] Fix setting package versions in VS insertion (#11103)

* fix setting package versions

* use VS branch names in servicing package decision

---------

Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>

* Update vs/msbuild version (#11115)

* Update vs/msbuild version

* Bump version

* Update xcopy-msbuild version to 17.8.5 (#11118)

* Add inter-branch merge flow file (#11123)

* Update .opt-prof.yml (#11121)

* Bump up System.Text.Json to 8.0.5 (#11134)

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

* Update dependencies from https://github.com/dotnet/arcade build 20241223.2

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24570.5 -> To Version 8.0.0-beta.24623.2

* Update VersionPrefix to 17.8.16

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz>

* disallow package conflicts by default and add override parameter (#11152)

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

* Update dependencies from https://github.com/dotnet/arcade build 20250110.1

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.24623.2 -> To Version 8.0.0-beta.25060.1

* version bump

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz>

* Don't autocomplete servicing insertions (#11283)

* [vs17.8] Select proper VS channel (#11246)

* Update .vsts-dotnet.yml

* Update Versions.props

* Update .vsts-dotnet.yml

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

* Bump version

---------

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

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

* Update dependencies from https://github.com/dotnet/arcade build 20250116.6

Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions
 From Version 8.0.0-beta.25060.1 -> To Version 8.0.0-beta.25066.6

* Bump version

---------

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>

* Remove unnecessary change from branch vs17.8

* Bump up version prefix to 17.10.20

---------

Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>
Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>
Co-authored-by: sujitnayak <sujitn@microsoft.com>
Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>
Co-authored-by: YuliiaKovalova <ykovalova@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com>
Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@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: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz>
Co-authored-by: Rainer Sigwald <raines@microsoft.com>
@github-actions github-actions bot requested a review from a team as a code owner January 24, 2025 16:52
@github-actions github-actions bot force-pushed the merge/vs17.10-to-vs17.11 branch from aa3e87c to 477cd30 Compare January 24, 2025 16:52
@SimaTian SimaTian merged commit b9b4a39 into vs17.11 Jan 29, 2025
10 checks passed
@SimaTian SimaTian deleted the merge/vs17.10-to-vs17.11 branch January 29, 2025 08:31
This was referenced Aug 17, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants