Uri class when passed a GB18030 string with chars in the PUA range incorrectly encodes the PUA chars.
For e.g. if the PUA char is u+e038, Uri encodes it in UTF-8 as %25EE%2580%25B8 instead of %EE%80%B8 by double encoding the %.

The ClickOnce scenario that is failing is when an app's Installation Uri is set to a UNC path that has PUA chars. In this case, the UNC path is written to the Clickonce manifest. When the app is being installed, ClickOnce Runtime will attempt to download the deployment manifest from the UNC path. Since the Uri is incorrectly encoded, this download will fail.

Changes Made

The FormatUrl function is being updated to resolve this issue. This function takes input path as string and return a canonicalized path by constructing a Uri class with the input path and then returning it's AbsoluteUri property.

In the case where the Uri's Scheme is File (file://), the function will now check if there are non-ascii characters in it and if so, create a new Uri with the UriBuilder class. The Uri created by UriBuilder correctly handles PUA range in GB18030.

Regression?

Yes

Customer Impact

ClickOnce apps published with Installation path set to a UNC path containing GB18030 + PUA chars will be installed correctly after this change.

Testing

Failing scenario has been validated and CTI team has run regression tests on affected scenarios (scenarios where Uri are used for publishing).

Risk

Low (Already deployed with 17.9/8.0.2xx)

Workaround for incorrect encoding of PUA range in GB18030 Uri string

da568eb

sujitnayak requested review fromrainersigwald andJohn-Hart

February 15, 2024 23:23

rainersigwald approved these changes

Feb 15, 2024

View reviewed changes

John-Hart approved these changes

Feb 15, 2024

View reviewed changes

AR-May approved these changes

Feb 16, 2024

View reviewed changes

Copy link

Member

JanKrivanek commentedFeb 16, 2024

Port of#9669

JanKrivanek added the Servicing-consider label

Feb 16, 2024

Copy link

Contributor

dotnet-policy-servicebot commentedFeb 16, 2024

Hello! I noticed that you're targeting one of our servicing branches. Please consider updating the version.

JanKrivanek changed the title~~Workaround for incorrect encoding of PUA range in GB18030 Uri string~~[17.8] Workaround for incorrect encoding of PUA range in GB18030 Uri string

Feb 16, 2024

JanKrivanek changed the title~~[17.8] Workaround for incorrect encoding of PUA range in GB18030 Uri string~~[vs17.8] Workaround for incorrect encoding of PUA range in GB18030 Uri string

Feb 16, 2024

JanKrivanek added Servicing-approved and removed Servicing-consider labels

Feb 20, 2024

JanKrivanek merged commitd00a8a9 intodotnet:vs17.8

Feb 20, 2024

maridematte added a commit that referenced this pull request

May 2, 2024

[automated] Merge branch 'vs17.9' => 'vs17.10' (#10081)

4e49442

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

maridematte pushed a commit that referenced this pull request

May 6, 2024

[automated] Merge branch 'vs17.10' => 'main' (#10098)

25ca7aa

* Check version bump on release branches' update* Skip check version bump on release branch update for initial commit to release branch or the change from dotnet bot* Remove the exception for dependencies update by dotnet-maestro[bot]* Bump version* [automated] Merge branch 'vs17.9' => 'vs17.10' (#10081)* 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

JanKrivanek added a commit that referenced this pull request

Dec 13, 2024

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

7c2b926

* 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 fromhttps://github.com/dotnet/arcade build 20241008.1Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.24508.1Dependency coherency updatesMicrosoft.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 fromhttps://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 fromhttps://github.com/dotnet/arcade build 20241025.2 (#10894)* [vs17.8] Update dependencies from dotnet/arcade (#10986)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241112.12Microsoft.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 fromhttps://github.com/dotnet/arcade build 20241120.5Microsoft.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>

JanKrivanek added a commit that referenced this pull request

Dec 19, 2024

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

eb37b2e

* Check version bump on release branches' update* Skip check version bump on release branch update for initial commit to release branch or the change from dotnet bot* Remove the exception for dependencies update by dotnet-maestro[bot]* Bump version* [automated] Merge branch 'vs17.9' => 'vs17.10' (#10081)* 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>* Disable localization for vs17.10 (#10269)Co-authored-by: Rainer Sigwald <raines@microsoft.com>* Enable private feeds for release branch (#10355)This PR enables MSBuild to take security fixes from MSBuild dependencies.* [vs17.10] Update dependencies from dotnet/arcade (#10809)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241008.1Microsoft.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>* CG alert cleaning on VS17.10 (#10724)* Bump Microsoft.IO.Redist to 6.0.1* Bump System.Formats.Asn1 to 8.0.1* [vs17.10] Update dependencies from dotnet/arcade (#10833)* [vs17.10] Update dependencies from dotnet/arcade (#10896)* [vs17.10] Update dependencies from dotnet/arcade (#10992)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241112.12Microsoft.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 commit66381f3.* Update dependencies fromhttps://github.com/dotnet/arcade build 20241120.5Microsoft.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 commit2cffa88.---------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>* [automated] Merge branch 'vs17.8' => 'vs17.10' (#11124)* 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 fromhttps://github.com/dotnet/arcade build 20241008.1Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.24508.1Dependency coherency updatesMicrosoft.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 fromhttps://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 fromhttps://github.com/dotnet/arcade build 20241025.2 (#10894)* [vs17.8] Update dependencies from dotnet/arcade (#10986)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241112.12Microsoft.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 fromhttps://github.com/dotnet/arcade build 20241120.5Microsoft.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>* [vs17.10] Run tests even if version is not bumped (#11059)Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>* Bump up version prefix to 17.11.20---------Co-authored-by: Gang Wang <v-gaw@microsoft.com>Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com>Co-authored-by: dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com>Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.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: Mariana Dematte <magarces@microsoft.com>Co-authored-by: AR-May <67507805+AR-May@users.noreply.github.com>Co-authored-by: Rainer Sigwald <raines@microsoft.com>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: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>Co-authored-by: Jan Provazník <janprovaznik@microsoft.com>Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>

SimaTian added a commit that referenced this pull request

Jan 20, 2025

[automated] Merge branch 'vs17.13' => 'main' (#11281)

d0af071

* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 10000931 (#10267)* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 9752299* Increase VersionPrefix version---------Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>* [17.11] Fix component governance alerts (#10520)* Resolves CG alerts---------Co-authored-by: Rainer Sigwald <raines@microsoft.com>* Assembly redirect fix (#10624)* Fixing the assembly redirect* [vs17.11] Update dependencies from dotnet/arcade (#10654)* Update dependencies fromhttps://github.com/dotnet/arcade build 20240910.4Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24311.3 -> To Version 8.0.0-beta.24460.4* version bump---------Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>Co-authored-by: Mariana Garces Dematte <magarces@microsoft.com>* Upgrade system.text.json to 8.0.4 (#10650)Will addressdotnet/sdk#43339 when deployed in VS.---------Co-authored-by: Rainer Sigwald <raines@microsoft.com>* disable loc (#10693)Part of:#10665Disabling localization for 17.11.* [vs17.11] Update dependencies from dotnet/arcade (#10691)* [vs17.11] Update dependencies from dotnet/arcade (#10793)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241008.1Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.24475.3 -> To Version 8.0.0-beta.24508.1* bump the version---------Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>* CG alert cleaning on VS17.11 (#10723)* Bump Microsoft.IO.Redist to 6.0.1* Bump version prefix to 17.11.11* [vs17.11] Update dependencies from dotnet/arcade (#10832)* [vs17.11] Update dependencies from dotnet/arcade (#10895)* [vs17.11] Update dependencies from dotnet/arcade (#10990)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241112.12Microsoft.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.11.16---------Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>Co-authored-by: Gang Wang <v-gaw@microsoft.com>* Update dependencies fromhttps://github.com/dotnet/arcade build 20241120.5Microsoft.SourceBuild.Intermediate.arcade , 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.11.17* [vs17.11] Run tests even if version is not bumped (#11060)Backport of#11042 to vs17.11* [vs17.11] Backport VS insertion pipeline YMLs (#11064)Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>* [vs17.12] Update dependencies from dotnet/arcade (#11034)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241122.2Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24562.13 -> To Version 9.0.0-beta.24572.2* Update version prefix to 17.12.14* Update BootstrapSdkVersion* Decreasing severity of IDE0306* Decrease IDE0303 severity* Update cibuild_bootstrapped_msbuild.ps1* Update cibuild_bootstrapped_msbuild.sh---------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 Krivanek <jankrivanek@microsoft.com>* Final Branding (#11130)* Bump version (#11135)* [vs17.12] Disable 17.12 localization (#11132)* Update .vsts-dotnet.yml* Version bump* [vs17.12] Bump VS and xcopy-msbuild version to 17.12.0 (#11155)* Bump up VS version to 17.12* Bump up xcopy-msbuild to 17.12.0* Bump up version prefix to 17.12.21---------Co-authored-by: Gang Wang <v-gaw@microsoft.com>* [automated] Merge branch 'vs17.10' => 'vs17.11' (#11137)* Check version bump on release branches' update* Skip check version bump on release branch update for initial commit to release branch or the change from dotnet bot* Remove the exception for dependencies update by dotnet-maestro[bot]* Bump version* [automated] Merge branch 'vs17.9' => 'vs17.10' (#10081)* 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>* Disable localization for vs17.10 (#10269)Co-authored-by: Rainer Sigwald <raines@microsoft.com>* Enable private feeds for release branch (#10355)This PR enables MSBuild to take security fixes from MSBuild dependencies.* [vs17.10] Update dependencies from dotnet/arcade (#10809)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241008.1Microsoft.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>* CG alert cleaning on VS17.10 (#10724)* Bump Microsoft.IO.Redist to 6.0.1* Bump System.Formats.Asn1 to 8.0.1* [vs17.10] Update dependencies from dotnet/arcade (#10833)* [vs17.10] Update dependencies from dotnet/arcade (#10896)* [vs17.10] Update dependencies from dotnet/arcade (#10992)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241112.12Microsoft.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 commit66381f3.* Update dependencies fromhttps://github.com/dotnet/arcade build 20241120.5Microsoft.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 commit2cffa88.---------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>* [automated] Merge branch 'vs17.8' => 'vs17.10' (#11124)* 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 fromhttps://github.com/dotnet/arcade build 20241008.1Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.24508.1Dependency coherency updatesMicrosoft.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 fromhttps://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 fromhttps://github.com/dotnet/arcade build 20241025.2 (#10894)* [vs17.8] Update dependencies from dotnet/arcade (#10986)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241112.12Microsoft.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 fromhttps://github.com/dotnet/arcade build 20241120.5Microsoft.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>* [vs17.10] Run tests even if version is not bumped (#11059)Co-authored-by: Jan Provaznik <janprovaznik@microsoft.com>* Bump up version prefix to 17.11.20---------Co-authored-by: Gang Wang <v-gaw@microsoft.com>Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@users.noreply.github.com>Co-authored-by: dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com>Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.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: Mariana Dematte <magarces@microsoft.com>Co-authored-by: AR-May <67507805+AR-May@users.noreply.github.com>Co-authored-by: Rainer Sigwald <raines@microsoft.com>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: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>Co-authored-by: Jan Provazník <janprovaznik@microsoft.com>Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>* [vs17.13] Update dependencies from dotnet/source-build-reference-packages (#11177)* Update dependencies fromhttps://github.com/dotnet/source-build-reference-packages build 20241219.1Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 9.0.0-alpha.1.24604.1 -> To Version 9.0.0-alpha.1.24619.1* Bump version prefix to 17.13.2* Reintroduce formatting preventing unintentional interbranch flow---------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 Krivanek <jankrivanek@microsoft.com>* Eliminate the unnecessary change from vs17.11* Bump up version prefix to 17.12.22* Update SolutionPersistence version (#11188)* Update SolutionPersistence version* Bump version* Update SourceBuildPrebuiltBaseline.xml* Remove conditional reference to System.Text.Json* Bump up version prefix to 17.13.3* [vs17.13] Update dependencies from dotnet/arcade (#11221)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241223.3Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitExtensions From Version 9.0.0-beta.24572.2 -> To Version 9.0.0-beta.24623.3* 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>* Bump up version prefix to 17.13.4* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 10751309 (#11194)Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 10751309* Remove IO.Redist from GetPathToBuildToolsFile (#11270)Avoidsmicrosoft/azure-pipelines-tasks#20734 by directly using `File.Exists` in codepaths that didn't use `Microsoft.IO.Redist` until642eed5 and turn out to be critical to the current implementation of AzDO MSBuild-using tasks.Backport ofbfa266d.* Keep the translation in the main branch---------Co-authored-by: dotnet bot <dotnet-bot@dotnetfoundation.org>Co-authored-by: Jenny Bai <v-jennybai@microsoft.com>Co-authored-by: MichalPavlik <michalpavlik@outlook.com>Co-authored-by: Rainer Sigwald <raines@microsoft.com>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: Mariana Garces Dematte <magarces@microsoft.com>Co-authored-by: YuliiaKovalova <95473390+YuliiaKovalova@users.noreply.github.com>Co-authored-by: Gang Wang <v-gaw@microsoft.com>Co-authored-by: Surayya Huseyn Zada <114938397+surayya-MS@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>Co-authored-by: Jan Krivanek <jankrivanek@microsoft.com>Co-authored-by: dotnet-maestro-bot <dotnet-maestro-bot@microsoft.com>Co-authored-by: Forgind <12969783+Forgind@users.noreply.github.com>Co-authored-by: sujitnayak <sujitn@microsoft.com>Co-authored-by: YuliiaKovalova <ykovalova@microsoft.com>Co-authored-by: Surayya Huseyn Zada <shuseynzada@microsoft.com>Co-authored-by: AR-May <67507805+AR-May@users.noreply.github.com>Co-authored-by: Tomas Bartonek <tom.bartonek@volny.cz>

SimaTian added a commit that referenced this pull request

Jan 24, 2025

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

477cd30

* 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 fromhttps://github.com/dotnet/arcade build 20241008.1Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.XUnitExtensions From Version 8.0.0-beta.23425.2 -> To Version 8.0.0-beta.24508.1Dependency coherency updatesMicrosoft.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 fromhttps://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 fromhttps://github.com/dotnet/arcade build 20241025.2 (#10894)* [vs17.8] Update dependencies from dotnet/arcade (#10986)* Update dependencies fromhttps://github.com/dotnet/arcade build 20241112.12Microsoft.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 fromhttps://github.com/dotnet/arcade build 20241120.5Microsoft.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 fromhttps://github.com/dotnet/arcade build 20241223.2Microsoft.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 fromhttps://github.com/dotnet/arcade build 20250110.1Microsoft.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.ymlCo-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 fromhttps://github.com/dotnet/arcade build 20250116.6Microsoft.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>