Add netcoreapp1.0 support to Microsoft.TestPlatform.TestHost NuGet (#…

…2569) * Restore netcoreapp1.0 support for testhost * Updated nuspec files to include netstandard13 and netcoreapp10. * PR fixes Co-authored-by: Sam Harwell <Sam.Harwell@microsoft.com>
microsoft · Sep 17, 2020 · c667d3a · c667d3a
1 parent f2f8d72
commit c667d3a
Show file tree

Hide file tree

Showing 6 changed files with 347 additions and 150 deletions.
diff --git a/scripts/build.ps1 b/scripts/build.ps1
diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
@@ -14,14 +14,14 @@ function Verify-Nuget-Packages($packageDirectory)
     Write-Log "Starting Verify-Nuget-Packages."
     $expectedNumOfFiles = @{
                      "Microsoft.CodeCoverage" = 29;
-                     "Microsoft.NET.Test.Sdk" = 13;
+                     "Microsoft.NET.Test.Sdk" = 18;
                      "Microsoft.TestPlatform" = 477;
                      "Microsoft.TestPlatform.Build" = 19;
                      "Microsoft.TestPlatform.CLI" = 350;
                      "Microsoft.TestPlatform.Extensions.TrxLogger" = 33;
-                     "Microsoft.TestPlatform.ObjectModel" = 62;
+                     "Microsoft.TestPlatform.ObjectModel" = 91;
                      "Microsoft.TestPlatform.Portable" = 566;
-                     "Microsoft.TestPlatform.TestHost" = 145;
+                     "Microsoft.TestPlatform.TestHost" = 197;
                      "Microsoft.TestPlatform.TranslationLayer" = 121}
 
     $nugetPackages = Get-ChildItem -Filter "*.nupkg" $packageDirectory | % { $_.FullName}

diff --git a/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj b/src/Microsoft.TestPlatform.ObjectModel/Microsoft.TestPlatform.ObjectModel.csproj
@@ -31,17 +31,17 @@
     <ProjectReference Include="..\Microsoft.TestPlatform.CoreUtilities\Microsoft.TestPlatform.CoreUtilities.csproj" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.ComponentModel.EventBasedAsync" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
-    <PackageReference Include="System.ComponentModel.TypeConverter" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
-    <PackageReference Include="System.Reflection.TypeExtensions" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Serialization.Json" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
-    <PackageReference Include="System.Runtime.Serialization.Primitives" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XmlDocument" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
-    <PackageReference Include="System.Xml.XPath.XmlDocument" Condition="'$(TargetFramework)' == 'netstandard1.3'" Version="4.3.0" />
     <PackageReference Include="System.Reflection.Metadata" Version="1.6.0" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'" >
+    <PackageReference Include="System.ComponentModel.EventBasedAsync" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.TypeConverter" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Serialization.Json" Version="4.3.0" />
+    <PackageReference Include="System.Runtime.Serialization.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XPath" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XPath.XmlDocument" Version="4.3.0" />
     <PackageReference Include="NuGet.Frameworks" Version="4.6.4" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' != 'netstandard1.3' ">

diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec b/src/package/nuspec/Microsoft.NET.Test.Sdk.nuspec
@@ -22,6 +22,10 @@
         <!-- TestHost gets shipped as ExtensionSDKs with name TestPlatform.Universal. -->
         <!-- Currently code coverage not supported for uap10.0. -->
       </group>
+      <group targetFramework="netcoreapp1.0">
+        <dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
+        <dependency id="Microsoft.CodeCoverage" version="$Version$" />
+      </group>
       <group targetFramework="netcoreapp2.1">
         <dependency id="Microsoft.TestPlatform.TestHost" version="$Version$" />
         <dependency id="Microsoft.CodeCoverage" version="$Version$" />
@@ -33,10 +37,12 @@
     </dependencies>
   </metadata>
   <files>
+    <file src="netcoreapp\*" target="build\netcoreapp1.0\" />
     <file src="netcoreapp\*" target="build\netcoreapp2.1\" />
     <file src="netfx\*" target="build\net40\" />
 
     <file src="Microsoft.NET.Test.Sdk.props" target="buildMultiTargeting\" />
+    <file src="Microsoft.NET.Test.Sdk.props" target="build\netcoreapp1.0\" />
     <file src="Microsoft.NET.Test.Sdk.props" target="build\netcoreapp2.1\" />
     <file src="Microsoft.NET.Test.Sdk.props" target="build\net40\" />
     <file src="Microsoft.NET.Test.Sdk.props" target="build\uap10.0\" />