From 664fdd6059392e4b3ecc25b04443da32954cb0f0 Mon Sep 17 00:00:00 2001 From: Jake <31937616+JakeRadMSFT@users.noreply.github.com> Date: Tue, 24 Aug 2021 16:01:09 -0700 Subject: [PATCH 1/9] Update System.Text.Json.pkgdef --- src/Build/System.Text.Json.pkgdef | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Build/System.Text.Json.pkgdef b/src/Build/System.Text.Json.pkgdef index f20fee293fd..96be8f666e1 100644 --- a/src/Build/System.Text.Json.pkgdef +++ b/src/Build/System.Text.Json.pkgdef @@ -3,5 +3,5 @@ "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" +"oldVersion"="0.0.0.0-5.0.0.2" +"newVersion"="5.0.0.2" From 7a8ef0fd670a399c2c7ef8a77a5a7750cd45f51e Mon Sep 17 00:00:00 2001 From: Jake <31937616+JakeRadMSFT@users.noreply.github.com> Date: Tue, 24 Aug 2021 16:01:32 -0700 Subject: [PATCH 2/9] Update System.Text.Encodings.Web.pkgdef --- src/Build/System.Text.Encodings.Web.pkgdef | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Build/System.Text.Encodings.Web.pkgdef b/src/Build/System.Text.Encodings.Web.pkgdef index bee4d6921fe..acb1bed8848 100644 --- a/src/Build/System.Text.Encodings.Web.pkgdef +++ b/src/Build/System.Text.Encodings.Web.pkgdef @@ -3,5 +3,5 @@ "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" +"oldVersion"="0.0.0.0-5.0.0.1" +"newVersion"="5.0.0.1" From aa2dd5185f129d724f9756b7c8b28ca12f2f7939 Mon Sep 17 00:00:00 2001 From: Jake <31937616+JakeRadMSFT@users.noreply.github.com> Date: Tue, 24 Aug 2021 16:03:14 -0700 Subject: [PATCH 3/9] Update Packages.props --- eng/Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ - + From b70bb36922a385b4143d0c6e84d4ec6585856133 Mon Sep 17 00:00:00 2001 From: Jake <31937616+JakeRadMSFT@users.noreply.github.com> Date: Tue, 24 Aug 2021 16:25:29 -0700 Subject: [PATCH 4/9] Update app.config --- src/MSBuild/app.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index 4f9a252f295..f3e63ce0acd 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -82,11 +82,11 @@ - + - + From 49818aed40c588d36f48c62176e43cf93ec2a233 Mon Sep 17 00:00:00 2001 From: Jake <31937616+JakeRadMSFT@users.noreply.github.com> Date: Tue, 24 Aug 2021 16:26:11 -0700 Subject: [PATCH 5/9] Update app.amd64.config --- src/MSBuild/app.amd64.config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MSBuild/app.amd64.config b/src/MSBuild/app.amd64.config index 1946bc0bbb9..08931a86ee4 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -92,11 +92,11 @@ - + - + From c0b98750a822bafb9a6d697ca1ccf525fdf259df Mon Sep 17 00:00:00 2001 From: Jake <31937616+JakeRadMSFT@users.noreply.github.com> Date: Wed, 25 Aug 2021 09:30:52 -0700 Subject: [PATCH 6/9] Delete System.Text.Encodings.Web.pkgdef --- src/Build/System.Text.Encodings.Web.pkgdef | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 src/Build/System.Text.Encodings.Web.pkgdef diff --git a/src/Build/System.Text.Encodings.Web.pkgdef b/src/Build/System.Text.Encodings.Web.pkgdef deleted file mode 100644 index acb1bed8848..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-5.0.0.1" -"newVersion"="5.0.0.1" From 44777a1e43252af608eee61eb3fa391b71049111 Mon Sep 17 00:00:00 2001 From: Jake <31937616+JakeRadMSFT@users.noreply.github.com> Date: Wed, 25 Aug 2021 09:31:04 -0700 Subject: [PATCH 7/9] Delete System.Text.Json.pkgdef --- src/Build/System.Text.Json.pkgdef | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 src/Build/System.Text.Json.pkgdef diff --git a/src/Build/System.Text.Json.pkgdef b/src/Build/System.Text.Json.pkgdef deleted file mode 100644 index 96be8f666e1..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-5.0.0.2" -"newVersion"="5.0.0.2" From edeed7f9619cccc1ce68c201a23d9af744d0592a Mon Sep 17 00:00:00 2001 From: Jake <31937616+JakeRadMSFT@users.noreply.github.com> Date: Wed, 25 Aug 2021 09:52:25 -0700 Subject: [PATCH 8/9] Update files.swr --- src/Package/MSBuild.VSSetup/files.swr | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/Package/MSBuild.VSSetup/files.swr b/src/Package/MSBuild.VSSetup/files.swr index 66aabe0c5e3..50ab1f83aa8 100644 --- a/src/Package/MSBuild.VSSetup/files.swr +++ b/src/Package/MSBuild.VSSetup/files.swr @@ -310,8 +310,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 From e16b4a0f11a928c13910f17897858fc235c4d03e Mon Sep 17 00:00:00 2001 From: Rainer Sigwald Date: Tue, 31 Aug 2021 15:43:01 -0500 Subject: [PATCH 9/9] Binding redirect ValueTuple Match the VS-side binding redirects 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 --- src/MSBuild/MSBuild.csproj | 6 ++++++ src/MSBuild/app.amd64.config | 5 ++++- src/MSBuild/app.config | 5 ++++- src/Package/MSBuild.VSSetup/files.swr | 2 -- 4 files changed, 14 insertions(+), 4 deletions(-) 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 08931a86ee4..68875be0d1f 100644 --- a/src/MSBuild/app.amd64.config +++ b/src/MSBuild/app.amd64.config @@ -108,7 +108,10 @@ - + + diff --git a/src/MSBuild/app.config b/src/MSBuild/app.config index f3e63ce0acd..297c2ae740c 100644 --- a/src/MSBuild/app.config +++ b/src/MSBuild/app.config @@ -98,7 +98,10 @@ - + + diff --git a/src/Package/MSBuild.VSSetup/files.swr b/src/Package/MSBuild.VSSetup/files.swr index 50ab1f83aa8..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