From 616e9c6337284e7f2ad37f2ca6aa88b91f0b4c84 Mon Sep 17 00:00:00 2001
From: Jeremy Koritzinsky <jekoritz@microsoft.com>
Date: Wed, 19 Feb 2020 21:50:58 -0800
Subject: [PATCH] Fix managed hosting assembly PackageReference versions to
 libraries to 4.7.0 (#2115)

* Hardcode System.Text.Json and System.Text.Encodings.Web package version to 4.7.0.

* Use System.Reflection.Metadata@1.8.0 to match the combined dotnet/sdk+dotnet/toolset repo.
---
 eng/Version.Details.xml                                           | 8 --------
 eng/Versions.props                                                | 2 --
 .../Microsoft.Extensions.DependencyModel.csproj                   | 2 +-
 .../Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj        | 6 +++---
 .../Microsoft.Extensions.DependencyModel.Tests.csproj             | 4 ++--
 5 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 66c2e3d..bc72c12 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -166,14 +166,6 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>e793fcc19797f407a1b7e98d5f81b04e25a551c3</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="5.0.0-alpha.1.19563.6">
-      <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
-    </Dependency>
-    <Dependency Name="System.Text.Json" Version="5.0.0-alpha.1.19563.6">
-      <Uri>https://github.com/dotnet/corefx</Uri>
-      <Sha>5cee7c97d602f294e27c582d4dab81ec388f1d7b</Sha>
-    </Dependency>
     <Dependency Name="ILLink.Tasks" Version="0.1.6-prerelease.20117.1">
       <Uri>https://github.com/mono/linker</Uri>
       <Sha>72551f41d5925198262c1f3c2d06dfecd2596a4e</Sha>
diff --git a/eng/Versions.props b/eng/Versions.props
index 4a74966..db93a1c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -79,8 +79,6 @@
     <MicrosoftNETCoreILAsmVersion>5.0.0-alpha1.19563.3</MicrosoftNETCoreILAsmVersion>
     <MicrosoftNETSdkILVersion>5.0.0-alpha.1.20076.2</MicrosoftNETSdkILVersion>
     <!-- Libraries dependencies -->
-    <SystemTextJsonVersion>5.0.0-alpha.1.19563.6</SystemTextJsonVersion>
-    <SystemTextEncodingsWebVersion>5.0.0-alpha.1.19563.6</SystemTextEncodingsWebVersion>
     <runtimenativeSystemIOPortsVersion>5.0.0-alpha.1.19563.3</runtimenativeSystemIOPortsVersion>
     <!-- Runtime-Assets dependencies -->
     <SystemComponentModelTypeConverterTestDataVersion>5.0.0-beta.20105.1</SystemComponentModelTypeConverterTestDataVersion>
diff --git a/src/installer/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj b/src/installer/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj
index b5ff2f8..c3d372a 100644
--- a/src/installer/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj
+++ b/src/installer/managed/Microsoft.Extensions.DependencyModel/Microsoft.Extensions.DependencyModel.csproj
@@ -25,7 +25,7 @@
     -->
     <When Condition="'$(TargetFramework)' == 'netstandard2.0'">
       <ItemGroup>
-        <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
+        <PackageReference Include="System.Text.Json" Version="4.7.0" />
       </ItemGroup>
       <ItemGroup>
         <Compile Remove="DependencyContextJsonReader.JsonTextReader.cs" />
diff --git a/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj b/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj
index 3ec75a9..871ac9a 100644
--- a/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj
+++ b/src/installer/managed/Microsoft.NET.HostModel/Microsoft.NET.HostModel.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Abstractions for modifying .net core host-binaries</Description>
   </PropertyGroup>
-    
+
   <PropertyGroup>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
@@ -13,9 +13,9 @@
 
   <ItemGroup>
     <PackageReference Include="System.Reflection.Metadata">
-      <Version>1.5.0</Version>
+      <Version>1.8.0</Version>
     </PackageReference>
-    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
+    <PackageReference Include="System.Text.Json" Version="4.7.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/installer/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.csproj b/src/installer/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.csproj
index 34be75a..b17142c 100644
--- a/src/installer/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.csproj
+++ b/src/installer/test/Microsoft.Extensions.DependencyModel.Tests/Microsoft.Extensions.DependencyModel.Tests.csproj
@@ -17,8 +17,8 @@
     <PackageReference Include="Moq" Version="4.7.142" />
     <PackageReference Include="NuGet.Versioning" Version="4.0.0" />
     <PackageReference Include="Microsoft.DotNet.ProjectModel" Version="1.0.0-rc2-002702" />
-    <PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
-    <PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
+    <PackageReference Include="System.Text.Json" Version="4.7.0" />
+    <PackageReference Include="System.Text.Encodings.Web" Version="4.7.0" />
     <ProjectReference Include="..\..\managed\Microsoft.DotNet.PlatformAbstractions\Microsoft.DotNet.PlatformAbstractions.csproj" />
     <ProjectReference Include="..\..\managed\Microsoft.Extensions.DependencyModel\Microsoft.Extensions.DependencyModel.csproj" />
   </ItemGroup>
-- 
2.7.4