From 596f08dcfe629084c9f69e8a929deffad73a8ed9 Mon Sep 17 00:00:00 2001 From: Jake <31937616+JakeRadMSFT@users.noreply.github.com> Date: Wed, 1 Sep 2021 07:39:37 -0700 Subject: [PATCH] Update System.Text.Json to 5.0.2 (#6784) Visual Studio recently updated STJ and we can follow suit. https://dev.azure.com/devdiv/DevDiv/_git/VS/pullrequest/346604 Include binding redirect updates for STJ and its direct dependency System.Text.Encodings.Web. Remove pkgdefs for them since they are now delivered by VS itself. Match the VS-side binding redirects for System.ValueTuple that force the use of 4.0.0.0 in all cases. Stop carrying a copy, since it will now always be found in the GAC as part of .NET 4.7.2+, required by VS. https://devdiv.visualstudio.com/DevDiv/_git/VS?path=%2Fsrc%2Fappid%2Fcommon%2Fcorefx.config.ttinclude&version=GBmain&line=93&lineEnd=101&lineStartColumn=1&lineEndColumn=29&lineStyle=plain&_a=contents Co-authored-by: Rainer Sigwald --- eng/Packages.props | 2 +- src/Build/System.Text.Encodings.Web.pkgdef | 7 ------- src/Build/System.Text.Json.pkgdef | 7 ------- src/MSBuild/MSBuild.csproj | 6 ++++++ src/MSBuild/app.amd64.config | 9 ++++++--- src/MSBuild/app.config | 9 ++++++--- src/Package/MSBuild.VSSetup/files.swr | 4 ---- 7 files changed, 19 insertions(+), 25 deletions(-) delete mode 100644 src/Build/System.Text.Encodings.Web.pkgdef delete mode 100644 src/Build/System.Text.Json.pkgdef diff --git a/eng/Packages.props b/eng/Packages.props index 1828ea18089..b4e087118a4 100644 --- a/eng/Packages.props +++ b/eng/Packages.props @@ -35,7 +35,7 @@ - + diff --git a/src/Build/System.Text.Encodings.Web.pkgdef b/src/Build/System.Text.Encodings.Web.pkgdef deleted file mode 100644 index bee4d6921fe..00000000000 --- a/src/Build/System.Text.Encodings.Web.pkgdef +++ /dev/null @@ -1,7 +0,0 @@ -[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{1A1A9DA4-9F25-4AC8-89BF-BCEF74875CA8}] -"name"="System.Text.Encodings.Web" -"codeBase"="$BaseInstallDir$\MSBuild\Current\Bin\System.Text.Encodings.Web.dll" -"publicKeyToken"="cc7b13ffcd2ddd51" -"culture"="neutral" -"oldVersion"="0.0.0.0-4.0.5.0" -"newVersion"="4.0.5.0" diff --git a/src/Build/System.Text.Json.pkgdef b/src/Build/System.Text.Json.pkgdef deleted file mode 100644 index f20fee293fd..00000000000 --- a/src/Build/System.Text.Json.pkgdef +++ /dev/null @@ -1,7 +0,0 @@ -[$RootKey$\RuntimeConfiguration\dependentAssembly\bindingRedirection\{1F1A9DA4-9F25-4AB8-89BF-BCEF73875178}] -"name"="System.Text.Json" -"codeBase"="$BaseInstallDir$\MSBuild\Current\Bin\System.Text.Json.dll" -"publicKeyToken"="cc7b13ffcd2ddd51" -"culture"="neutral" -"oldVersion"="0.0.0.0-4.0.1.0" -"newVersion"="4.0.1.0" diff --git a/src/MSBuild/MSBuild.csproj b/src/MSBuild/MSBuild.csproj index 34b768cd9c1..93185ce820a 100644 --- a/src/MSBuild/MSBuild.csproj +++ b/src/MSBuild/MSBuild.csproj @@ -25,11 +25,17 @@ false MSBuild.exe.manifest + app.config app.amd64.config + + false + true contentFiles contentFiles\any\ diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 1946bc0bbb9..68875be0d1f 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -92,11 +92,11 @@ - + - + @@ -108,7 +108,10 @@ - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 4f9a252f295..297c2ae740c 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -82,11 +82,11 @@ - + - + @@ -98,7 +98,10 @@ - + + diff --git a/src/Package/MSBuild.VSSetup/files.swr b/src/Package/MSBuild.VSSetup/files.swr index 66aabe0c5e3..67e5764974d 100644 --- a/src/Package/MSBuild.VSSetup/files.swr +++ b/src/Package/MSBuild.VSSetup/files.swr @@ -42,7 +42,6 @@ folder InstallDir:\MSBuild\Current\Bin file source=$(X86BinPath)Microsoft.Bcl.AsyncInterfaces.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 file source=$(X86BinPath)System.Text.Encodings.Web.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 file source=$(X86BinPath)System.Threading.Tasks.Extensions.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 - file source=$(X86BinPath)System.ValueTuple.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 file source=$(X86BinPath)System.Numerics.Vectors.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 file source=$(X86BinPath)System.Resources.Extensions.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 file source=$(X86BinPath)System.Runtime.CompilerServices.Unsafe.dll vs.file.ngenApplications="[installDir]\MSBuild\Current\Bin\MSBuild.exe" vs.file.ngenArchitecture=all vs.file.ngenPriority=1 @@ -187,7 +186,6 @@ folder InstallDir:\MSBuild\Current\Bin\amd64 file source=$(X86BinPath)Microsoft.Bcl.AsyncInterfaces.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Text.Encodings.Web.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Threading.Tasks.Extensions.dll vs.file.ngenArchitecture=all - file source=$(X86BinPath)System.ValueTuple.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Numerics.Vectors.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Resources.Extensions.dll vs.file.ngenArchitecture=all file source=$(X86BinPath)System.Runtime.CompilerServices.Unsafe.dll vs.file.ngenArchitecture=all @@ -310,8 +308,6 @@ folder InstallDir:\Common7\IDE\CommonExtensions\MSBuild file source=$(SourceDir)Package\MSBuild.VSSetup\MSBuild.clientenabledpkg file source=$(SourceDir)Framework\Microsoft.Build.Framework.pkgdef file source=$(SourceDir)Build\Microsoft.Build.pkgdef - file source=$(SourceDir)Build\System.Text.Encodings.Web.pkgdef - file source=$(SourceDir)Build\System.Text.Json.pkgdef file source=$(SourceDir)StringTools\StringTools.pkgdef file source=$(SourceDir)Tasks\Microsoft.Build.Tasks.Core.pkgdef file source=$(SourceDir)Tasks\System.Resources.Extensions.pkgdef