From b7fc5951c9b805b1d16bd389f9817ce7847915d5 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Wed, 26 Jun 2019 13:29:30 -0400
Subject: [PATCH 01/10] Create netstandard2.0 target for objectmodel

---
 scripts/build/TestPlatform.Settings.targets              | 2 +-
 .../Microsoft.TestPlatform.ObjectModel.csproj            | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/scripts/build/TestPlatform.Settings.targets b/scripts/build/TestPlatform.Settings.targets
index a6ab0ab862..33a5b9e041 100644
--- a/scripts/build/TestPlatform.Settings.targets
+++ b/scripts/build/TestPlatform.Settings.targets
@@ -28,7 +28,7 @@
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <!-- .NetStandardLibrary1.6.0 brings in dependencies which are supported in UWP,
          any higher version will bring in dependencies which are not supported by current UWP version -->
-    <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' != 'netstandard2.0' ">1.6.0</NetStandardImplicitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
index 5810224e7d..aaa32d165c 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
+++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
@@ -6,7 +6,7 @@
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
   <PropertyGroup>
     <AssemblyName>Microsoft.VisualStudio.TestPlatform.ObjectModel</AssemblyName>
-    <TargetFrameworks>net451;netstandard1.4</TargetFrameworks>
+    <TargetFrameworks>net451;netstandard1.4;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4</TargetFrameworks>
     <PackageId>Microsoft.TestPlatform.ObjectModel</PackageId>
   </PropertyGroup>
@@ -57,7 +57,12 @@
     <PackageReference Include="System.Reflection.TypeExtensions">
       <Version>4.1.0</Version>
     </PackageReference>
-  </ItemGroup>
+  </ItemGroup>  
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="System.Xml.XPath.XmlDocument">
+      <Version>4.3.0</Version>
+    </PackageReference>
+  </ItemGroup>  
   <ItemGroup>
     <Compile Update="Resources\CommonResources.Designer.cs">
       <DesignTime>True</DesignTime>

From 0014c6da754cae957efd6ef4d83009edae1624a0 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Wed, 26 Jun 2019 16:02:41 -0400
Subject: [PATCH 02/10] add netstandard2.0 targets

---
 .../Microsoft.TestPlatform.CoreUtilities.csproj               | 2 +-
 src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs  | 2 +-
 .../Microsoft.TestPlatform.PlatformAbstractions.csproj        | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
index cfdac10080..c6c37a283f 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
@@ -6,7 +6,7 @@
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.CoreUtilities</AssemblyName>
-    <TargetFrameworks>netstandard1.4;net451</TargetFrameworks>
+    <TargetFrameworks>netstandard1.4;net451;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.4</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
index c946f142d5..ee0194b546 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Tracing/EqtTrace.cs
@@ -50,7 +50,7 @@ public static TraceLevel TraceLevel
 
 #endif
 
-#if NETSTANDARD1_4
+#if NETSTANDARD1_4 || NETSTANDARD2_0
         public static PlatformTraceLevel TraceLevel
         {
             get
diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
index d26b12cd0a..1cebd63fb1 100644
--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
+++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
@@ -6,7 +6,7 @@
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
   <PropertyGroup>
     <AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName>
-    <TargetFrameworks>netstandard1.0;netcoreapp1.0;net451;uap10.0</TargetFrameworks>
+    <TargetFrameworks>netstandard1.0;netcoreapp1.0;net451;uap10.0;netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.0;netcoreapp1.0</TargetFrameworks>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     <EnableCodeAnalysis>true</EnableCodeAnalysis>
@@ -31,7 +31,7 @@
     <Compile Include="Interfaces\**\*.cs" />
     <Compile Include="Properties\**\*.cs" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.0' or '$(TargetFramework)' == 'netstandard2.0' ">
     <Compile Include="netstandard1.0\**\*.cs" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">

From 855194c85b9ea87e8e2f3d7f16c40d30427679e4 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Wed, 26 Jun 2019 16:10:21 -0400
Subject: [PATCH 03/10] Add netcoreapp2.1 tests to validate netstandard2.0
 targets

---
 .../Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj     | 4 ++--
 .../Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj   | 4 ++--
 .../Microsoft.TestPlatform.ObjectModel.UnitTests.csproj       | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj
index 5bb71b23a8..b7cc5ed6c6 100644
--- a/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.CoreUtilities.UnitTests/Microsoft.TestPlatform.CoreUtilities.UnitTests.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
   <PropertyGroup>
-    <OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">Exe</OutputType>
-    <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
+    <OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' or '$(TargetFramework)' == 'netcoreapp2.1' ">Exe</OutputType>
+    <TargetFrameworks>netcoreapp1.0;net451;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>Microsoft.TestPlatform.CoreUtilities.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">
diff --git a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj
index 1c666086ad..0715b451aa 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj
+++ b/test/Microsoft.TestPlatform.ObjectModel.PlatformTests/Microsoft.TestPlatform.ObjectModel.PlatformTests.csproj
@@ -5,8 +5,8 @@
   </PropertyGroup>
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
   <PropertyGroup>
-    <OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">Exe</OutputType>
-    <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
+    <OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' or '$(TargetFramework)' == 'netcoreapp2.1'">Exe</OutputType>
+    <TargetFrameworks>netcoreapp1.0;net451;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>Microsoft.TestPlatform.ObjectModel.PlatformTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
diff --git a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj
index ebc1d26684..0990e7d6a0 100644
--- a/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj
+++ b/test/Microsoft.TestPlatform.ObjectModel.UnitTests/Microsoft.TestPlatform.ObjectModel.UnitTests.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
   <Import Project="$(TestPlatformRoot)scripts/build/TestPlatform.Settings.targets" />
   <PropertyGroup>
-    <OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' ">Exe</OutputType>
-    <TargetFrameworks>netcoreapp1.0;net451</TargetFrameworks>
+    <OutputType Condition=" '$(TargetFramework)' == 'netcoreapp1.0' or '$(TargetFramework)' == 'netcoreapp2.1' ">Exe</OutputType>
+    <TargetFrameworks>netcoreapp1.0;net451;netcoreapp2.1</TargetFrameworks>
     <AssemblyName>Microsoft.TestPlatform.ObjectModel.UnitTests</AssemblyName>
   </PropertyGroup>
   <ItemGroup>

From 9f1b862873b9965887d94f9a721f85aec71f6ba1 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Wed, 26 Jun 2019 16:23:10 -0400
Subject: [PATCH 04/10] don't use 1.6 lib for newer platforms

---
 scripts/build/TestPlatform.Settings.targets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/build/TestPlatform.Settings.targets b/scripts/build/TestPlatform.Settings.targets
index 33a5b9e041..699798029e 100644
--- a/scripts/build/TestPlatform.Settings.targets
+++ b/scripts/build/TestPlatform.Settings.targets
@@ -28,7 +28,7 @@
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
     <!-- .NetStandardLibrary1.6.0 brings in dependencies which are supported in UWP,
          any higher version will bring in dependencies which are not supported by current UWP version -->
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' != 'netstandard2.0' ">1.6.0</NetStandardImplicitPackageVersion>
+    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' != 'netstandard2.0' or '$(TargetFramework)' != 'netcoreapp2.0' or '$(TargetFramework)' != 'netcoreapp2.1' ">1.6.0</NetStandardImplicitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">

From 43e8be8053182961a66d9bc25cb8d115fe7c8d7c Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Wed, 26 Jun 2019 16:35:54 -0400
Subject: [PATCH 05/10] user newer deps

---
 scripts/build/TestPlatform.Settings.targets                   | 3 ---
 .../Microsoft.TestPlatform.ObjectModel.csproj                 | 4 +---
 src/vstest.console/vstest.console.csproj                      | 3 ---
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/scripts/build/TestPlatform.Settings.targets b/scripts/build/TestPlatform.Settings.targets
index 699798029e..0f7664a85c 100644
--- a/scripts/build/TestPlatform.Settings.targets
+++ b/scripts/build/TestPlatform.Settings.targets
@@ -26,9 +26,6 @@
     <!-- Disable default inclusion of .resx file. We generate files in the Resources directory only
          if localization is enabled, default inclusion ends up including the generated files by default. -->
     <EnableDefaultEmbeddedResourceItems>false</EnableDefaultEmbeddedResourceItems>
-    <!-- .NetStandardLibrary1.6.0 brings in dependencies which are supported in UWP,
-         any higher version will bring in dependencies which are not supported by current UWP version -->
-    <NetStandardImplicitPackageVersion Condition=" '$(TargetFramework)' != 'netstandard2.0' or '$(TargetFramework)' != 'netcoreapp2.0' or '$(TargetFramework)' != 'netcoreapp2.1' ">1.6.0</NetStandardImplicitPackageVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
index aaa32d165c..ddf0cb2769 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
+++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
@@ -31,9 +31,7 @@
     <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation">
-      <Version>4.0.0</Version>
-    </PackageReference>
+
     <PackageReference Include="System.Reflection.Metadata">
       <Version>1.3.0</Version>
     </PackageReference>
diff --git a/src/vstest.console/vstest.console.csproj b/src/vstest.console/vstest.console.csproj
index 9406287458..43d7a3f6c6 100644
--- a/src/vstest.console/vstest.console.csproj
+++ b/src/vstest.console/vstest.console.csproj
@@ -41,9 +41,6 @@
     <PackageReference Include="System.Diagnostics.Contracts">
       <Version>4.0.1</Version>
     </PackageReference>
-    <PackageReference Include="System.Xml.XPath">
-      <Version>4.0.1</Version>
-    </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
     <Reference Include="System" />

From 6cf37537fe03e29077d889f8e90246a94cd55834 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Wed, 26 Jun 2019 16:51:30 -0400
Subject: [PATCH 06/10] fix more refs

---
 .../Microsoft.TestPlatform.Extensions.TrxLogger.csproj     | 6 +++---
 ...soft.TestPlatform.VsTestConsole.TranslationLayer.csproj | 6 ------
 src/datacollector/datacollector.csproj                     | 7 +------
 3 files changed, 4 insertions(+), 15 deletions(-)

diff --git a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
index 21452ae93c..407ef10948 100644
--- a/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
+++ b/src/Microsoft.TestPlatform.Extensions.TrxLogger/Microsoft.TestPlatform.Extensions.TrxLogger.csproj
@@ -25,13 +25,13 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
     <PackageReference Include="System.Collections.NonGeneric">
-      <Version>4.0.1</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.Security.Principal.Windows">
-      <Version>4.0.0</Version>
+      <Version>4.5.1</Version>
     </PackageReference>
     <PackageReference Include="System.Collections.Specialized">
-      <Version>4.0.1</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
index 1139b62a48..7c10ee5738 100644
--- a/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
+++ b/src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Microsoft.TestPlatform.VsTestConsole.TranslationLayer.csproj
@@ -26,12 +26,6 @@
     <PackageReference Include="System.Runtime.Serialization.Primitives">
       <Version>4.1.1</Version>
     </PackageReference>
-    <PackageReference Include="System.Xml.XPath.XmlDocument">
-      <Version>4.0.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.InteropServices">
-      <Version>4.1.0</Version>
-    </PackageReference>
     <PackageReference Include="System.ComponentModel.TypeConverter">
       <Version>4.1.0</Version>
     </PackageReference>
diff --git a/src/datacollector/datacollector.csproj b/src/datacollector/datacollector.csproj
index 267de806d8..eb91d13703 100644
--- a/src/datacollector/datacollector.csproj
+++ b/src/datacollector/datacollector.csproj
@@ -28,14 +28,9 @@
       <FromP2P>true</FromP2P>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' != 'net451' ">
-    <PackageReference Include="System.Runtime.Loader">
-      <Version>4.0.0</Version>
-    </PackageReference>
-  </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Reflection">
-      <Version>4.1.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">

From 89dd1275ef9c5a9dd96597309caa9b53e4851c51 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Wed, 26 Jun 2019 19:31:53 -0400
Subject: [PATCH 07/10] remove lib that's in the runtime

---
 src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
index 5236d5b79e..76cd1fdfa3 100644
--- a/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
+++ b/src/package/nuspec/Microsoft.TestPlatform.Portable.nuspec
@@ -369,7 +369,6 @@
     <file src="netcoreapp2.0\TestHost\Newtonsoft.Json.dll"	target="tools\netcoreapp2.0\TestHost\Newtonsoft.Json.dll" />
     <file src="netcoreapp2.0\TestHost\System.Collections.Immutable.dll"	target="tools\netcoreapp2.0\TestHost\System.Collections.Immutable.dll" />
     <file src="netcoreapp2.0\TestHost\System.Reflection.Metadata.dll"	target="tools\netcoreapp2.0\TestHost\System.Reflection.Metadata.dll" />
-    <file src="netcoreapp2.0\TestHost\System.Runtime.InteropServices.RuntimeInformation.dll"	target="tools\netcoreapp2.0\TestHost\System.Runtime.InteropServices.RuntimeInformation.dll" />
     <file src="netcoreapp2.0\TestHost\testhost.exe"	target="tools\netcoreapp2.0\TestHost\testhost.exe" />
     <file src="netcoreapp2.0\TestHost\testhost.exe.config"	target="tools\netcoreapp2.0\TestHost\testhost.exe.config" />
     <file src="netcoreapp2.0\TestHost\testhost.x86.exe"	target="tools\netcoreapp2.0\TestHost\testhost.x86.exe" />

From de0b8dbd7073ffd0ca47d8d8c8bcbd2bf884f40c Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Wed, 26 Jun 2019 19:53:00 -0400
Subject: [PATCH 08/10] fix packaging

---
 scripts/build.ps1                             |  2 +-
 ...icrosoft.TestPlatform.CoreUtilities.csproj |  2 +-
 .../Microsoft.TestPlatform.ObjectModel.csproj |  1 -
 .../nuspec/TestPlatform.ObjectModel.nuspec    | 58 +++++++++++++------
 4 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/scripts/build.ps1 b/scripts/build.ps1
index 0692bb1c36..e10fec1849 100644
--- a/scripts/build.ps1
+++ b/scripts/build.ps1
@@ -607,7 +607,7 @@ function Create-NugetPackages
         }
 
         Write-Verbose "$nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version $additionalArgs"
-        & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version`;JsonNetVersion=$JsonNetVersion`;Runtime=$TPB_TargetRuntime`;NetCoreTargetFramework=$TPB_TargetFrameworkCore20 $additionalArgs
+        & $nugetExe pack $stagingDir\$file -OutputDirectory $packageOutputDir -Version $TPB_Version -Properties Version=$TPB_Version`;JsonNetVersion=$JsonNetVersion`;Runtime=$TPB_TargetRuntime`;NetCoreTargetFramework20=$TPB_TargetFrameworkCore20`;NetCoreTargetFramework=$TPB_TargetFrameworkCore $additionalArgs
 
         Set-ScriptFailedOnError
     }
diff --git a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
index c6c37a283f..e3dba26a36 100644
--- a/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
+++ b/src/Microsoft.TestPlatform.CoreUtilities/Microsoft.TestPlatform.CoreUtilities.csproj
@@ -22,7 +22,7 @@
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
     <PackageReference Include="System.Diagnostics.FileVersionInfo">
-      <Version>4.0.0</Version>
+      <Version>4.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
index ddf0cb2769..ca50c8fdc5 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
+++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
@@ -31,7 +31,6 @@
     <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
   </ItemGroup>
   <ItemGroup>
-
     <PackageReference Include="System.Reflection.Metadata">
       <Version>1.3.0</Version>
     </PackageReference>
diff --git a/src/package/nuspec/TestPlatform.ObjectModel.nuspec b/src/package/nuspec/TestPlatform.ObjectModel.nuspec
index 10b12d8e43..cf21e513d0 100644
--- a/src/package/nuspec/TestPlatform.ObjectModel.nuspec
+++ b/src/package/nuspec/TestPlatform.ObjectModel.nuspec
@@ -15,30 +15,17 @@
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
     <dependencies>
       <group targetFramework="net451">
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
         <dependency id="System.Reflection.Metadata" version="[1.3.0, )" />
       </group>
       <group targetFramework="netstandard1.5">
-        <dependency id="NETStandard.Library" version="[1.6.0, )" />
-        <dependency id="System.ComponentModel.EventBasedAsync" version="[4.0.11, )" />
-        <dependency id="System.ComponentModel.TypeConverter" version="[4.1.0, )" />
-        <dependency id="System.Reflection.TypeExtensions" version="[4.1.0, )" />
-        <dependency id="System.Reflection.Metadata" version="[1.3.0, )" />
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
-        <dependency id="System.Runtime.Loader" version="[4.0.0, )" />
-        <dependency id="System.Runtime.Serialization.Primitives" version="[4.1.1, )" />
-        <dependency id="System.Runtime.Serialization.Json" version="[4.0.2, )" />
-        <dependency id="System.Xml.XPath.XmlDocument" version="[4.0.1, )" />
-
-        <!-- Dependencies for core utilities -->
-        <dependency id="System.Diagnostics.Process" version="[4.1.0, )" />
-        <dependency id="System.Diagnostics.TextWriterTraceListener" version="[4.0.0, )" />
-        <dependency id="System.Diagnostics.TraceSource" version="[4.0.0, )" />
-        <dependency id="System.Threading.Thread" version="[4.0.0, )" />
+        <dependency id="NETStandard.Library" version="[1.6.1, )" />
+        <dependency id="System.Xml.XPath.XmlDocument" version="[4.3.0, )" />
       </group>
       <group targetFramework="netstandard1.4">
-        <dependency id="System.ComponentModel.TypeConverter" version="[4.1.0, )" />
-        <dependency id="System.Runtime.InteropServices.RuntimeInformation" version="[4.0.0, )" />
+        <dependency id="System.Diagnostics.FileVersionInfo" version="[4.3.0, )" />
+      </group>
+      <group targetFramework="netstandard2.0">
+        <dependency id="System.Xml.XPath.XmlDocument" version="[4.3.0, )" />
       </group>
     </dependencies>
     <frameworkAssemblies>
@@ -60,6 +47,10 @@
     <file src="$NetCoreTargetFramework$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard1.5\" />
     <file src="$NetCoreTargetFramework$\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\netstandard1.5\" />
     <file src="$NetCoreTargetFramework$\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\netstandard1.5\" />
+    
+    <file src="$NetCoreTargetFramework20$\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard1.5\" />
+    <file src="$NetCoreTargetFramework20$\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\netstandard1.5\" />
+    <file src="$NetCoreTargetFramework20$\Microsoft.TestPlatform.PlatformAbstractions.dll" target="lib\netstandard1.5\" />    
 
     <file src="Microsoft.TestPlatform.TestHost\netstandard1.4\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll" target="lib\netstandard1.4\" />
     <file src="Microsoft.TestPlatform.TestHost\netstandard1.4\Microsoft.TestPlatform.CoreUtilities.dll" target="lib\netstandard1.4\" />
@@ -122,5 +113,34 @@
     <file src="$NetCoreTargetFramework$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.5\zh-Hans" />
     <file src="$NetCoreTargetFramework$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard1.5\zh-Hant" />
 
+    <file src="$NetCoreTargetFramework20$\cs\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\cs" />
+    <file src="$NetCoreTargetFramework20$\de\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\de" />
+    <file src="$NetCoreTargetFramework20$\es\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\es" />
+    <file src="$NetCoreTargetFramework20$\fr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\fr" />
+    <file src="$NetCoreTargetFramework20$\it\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\it" />
+    <file src="$NetCoreTargetFramework20$\ja\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\ja" />
+    <file src="$NetCoreTargetFramework20$\ko\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\ko" />
+    <file src="$NetCoreTargetFramework20$\pl\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\pl" />
+    <file src="$NetCoreTargetFramework20$\pt-BR\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\pt-BR" />
+    <file src="$NetCoreTargetFramework20$\ru\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\ru" />
+    <file src="$NetCoreTargetFramework20$\tr\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\tr" />
+    <file src="$NetCoreTargetFramework20$\zh-Hans\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\zh-Hans" />
+    <file src="$NetCoreTargetFramework20$\zh-Hant\Microsoft.VisualStudio.TestPlatform.ObjectModel.*resources.dll" target="lib\netstandard2.0\zh-Hant" />
+
+    <file src="$NetCoreTargetFramework20$\cs\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\cs" />
+    <file src="$NetCoreTargetFramework20$\de\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\de" />
+    <file src="$NetCoreTargetFramework20$\es\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\es" />
+    <file src="$NetCoreTargetFramework20$\fr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\fr" />
+    <file src="$NetCoreTargetFramework20$\it\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\it" />
+    <file src="$NetCoreTargetFramework20$\ja\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ja" />
+    <file src="$NetCoreTargetFramework20$\ko\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ko" />
+    <file src="$NetCoreTargetFramework20$\pl\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\pl" />
+    <file src="$NetCoreTargetFramework20$\pt-BR\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\pt-BR" />
+    <file src="$NetCoreTargetFramework20$\ru\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\ru" />
+    <file src="$NetCoreTargetFramework20$\tr\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\tr" />
+    <file src="$NetCoreTargetFramework20$\zh-Hans\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\zh-Hans" />
+    <file src="$NetCoreTargetFramework20$\zh-Hant\Microsoft.TestPlatform.CoreUtilities.resources.dll" target="lib\netstandard2.0\zh-Hant" />
+
+
   </files>
 </package>

From 87e39917af7be27290ecd764df3aeb49a3f878e8 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Wed, 26 Jun 2019 19:53:44 -0400
Subject: [PATCH 09/10] fix verify

---
 scripts/verify-nupkgs.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
index 7b38680665..6d9af869e7 100644
--- a/scripts/verify-nupkgs.ps1
+++ b/scripts/verify-nupkgs.ps1
@@ -16,7 +16,7 @@ function Verify-Nuget-Packages($packageDirectory)
                      "Microsoft.NET.Test.Sdk" = 13;
                      "Microsoft.TestPlatform" = 421;
                      "Microsoft.TestPlatform.Build" = 19;
-                     "Microsoft.TestPlatform.CLI" = 303;
+                     "Microsoft.TestPlatform.CLI" = 305;
                      "Microsoft.TestPlatform.Extensions.TrxLogger" = 33;
                      "Microsoft.TestPlatform.ObjectModel" = 65;
                      "Microsoft.TestPlatform.Portable" = 472;

From 932cbc528908dae2701c7994b022c778e752a588 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Thu, 27 Jun 2019 09:13:49 -0400
Subject: [PATCH 10/10] update SRM

---
 .../Microsoft.TestPlatform.ObjectModel.csproj                   | 2 +-
 src/package/nuspec/TestPlatform.ObjectModel.nuspec              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
index ca50c8fdc5..9aa52782ea 100644
--- a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
+++ b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
@@ -32,7 +32,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Reflection.Metadata">
-      <Version>1.3.0</Version>
+      <Version>1.6.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.4' ">
diff --git a/src/package/nuspec/TestPlatform.ObjectModel.nuspec b/src/package/nuspec/TestPlatform.ObjectModel.nuspec
index cf21e513d0..60de365eef 100644
--- a/src/package/nuspec/TestPlatform.ObjectModel.nuspec
+++ b/src/package/nuspec/TestPlatform.ObjectModel.nuspec
@@ -15,7 +15,7 @@
     <tags>vstest visual-studio unittest testplatform mstest microsoft test testing</tags>
     <dependencies>
       <group targetFramework="net451">
-        <dependency id="System.Reflection.Metadata" version="[1.3.0, )" />
+        <dependency id="System.Reflection.Metadata" version="[1.6.0, )" />
       </group>
       <group targetFramework="netstandard1.5">
         <dependency id="NETStandard.Library" version="[1.6.1, )" />