From b595464d091a69214424a05921c5d029c7a77f89 Mon Sep 17 00:00:00 2001
From: Adam Friedman <tintoy@tintoy.io>
Date: Mon, 27 Nov 2017 05:26:07 +1100
Subject: [PATCH] Switch remaining test projects over to netcoreapp2.0 (and use
 compatible versions of Microsoft.NET.Test.Sdk and Xunit).

dotnet/docfx#1963
---
 .../Microsoft.DocAsCode.HtmlToPdf.csproj                    | 2 +-
 src/docfx/docfx.csproj                                      | 4 +++-
 .../Microsoft.DocAsCode.Build.Common.Tests.csproj           | 2 +-
 ...crosoft.DocAsCode.Build.ConceptualDocuments.Tests.csproj | 2 +-
 ...crosoft.DocAsCode.Build.JavaScriptReference.Tests.csproj | 2 +-
 .../Microsoft.DocAsCode.Build.ManagedReference.Tests.csproj | 2 +-
 ...ocAsCode.Build.ManagedReference.WithPlugins.Tests.csproj | 2 +-
 .../Microsoft.DocAsCode.Build.MergeOverwrite.Tests.csproj   | 2 +-
 .../Microsoft.DocAsCode.Build.RestApi.Tests.csproj          | 2 +-
 ...crosoft.DocAsCode.Build.RestApi.WithPlugins.Tests.csproj | 2 +-
 .../Microsoft.DocAsCode.Build.SchemaDriven.Tests.csproj     | 2 +-
 .../Microsoft.DocAsCode.Build.TableOfContents.Tests.csproj  | 2 +-
 ...icrosoft.DocAsCode.Build.UniversalReference.Tests.csproj | 2 +-
 .../Microsoft.DocAsCode.Common.Tests.csproj                 | 2 +-
 .../Microsoft.DocAsCode.Dfm.Tests.csproj                    | 2 +-
 .../Microsoft.DocAsCode.Glob.Tests.csproj                   | 2 +-
 .../Microsoft.DocAsCode.MarkdownLite.Tests.csproj           | 2 +-
 .../Microsoft.DocAsCode.MarkdownRewriters.Tests.csproj      | 2 +-
 ...crosoft.DocAsCode.Metadata.ManagedReference.Tests.csproj | 2 +-
 .../Microsoft.DocAsCode.Plugins.Tests.csproj                | 2 +-
 test/Shared/test.base.props                                 | 6 +++---
 test/docfx.E2E.Tests/docfx.E2E.Tests.csproj                 | 2 +-
 test/docfx.Tests/docfx.Tests.csproj                         | 2 +-
 23 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/Microsoft.DocAsCode.HtmlToPdf/Microsoft.DocAsCode.HtmlToPdf.csproj b/src/Microsoft.DocAsCode.HtmlToPdf/Microsoft.DocAsCode.HtmlToPdf.csproj
index b35e0fca911..d04be650bcd 100644
--- a/src/Microsoft.DocAsCode.HtmlToPdf/Microsoft.DocAsCode.HtmlToPdf.csproj
+++ b/src/Microsoft.DocAsCode.HtmlToPdf/Microsoft.DocAsCode.HtmlToPdf.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../Shared/base.props" />
+  <Import Project="../Shared/base.netstandard.props" />
   <ItemGroup>
     <Compile Remove="Manifest.cs" />
     <Compile Remove="ManifestItem.cs" />
diff --git a/src/docfx/docfx.csproj b/src/docfx/docfx.csproj
index afb78311082..74a7dc45097 100644
--- a/src/docfx/docfx.csproj
+++ b/src/docfx/docfx.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="../Shared/base.props" />
+  <Import Project="../Shared/base.netcoreapp.props" />
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <Description>Generates documentation directly from source code and MarkDown files</Description>
@@ -31,6 +31,8 @@
   <ItemGroup>
     <PackageReference Include="CommandLineParser" Version="1.9.71" />
     <PackageReference Include="Owin" Version="1.0.0" />
+    <PackageReference Include="Microsoft.Build" Version="15.3.409" />
+    <PackageReference Include="Microsoft.Build.Runtime" Version="15.3.409" />
     <PackageReference Include="Microsoft.Owin" Version="3.0.1" />
     <PackageReference Include="Microsoft.Owin.FileSystems" Version="3.0.1" />
     <PackageReference Include="Microsoft.Owin.Host.HttpListener" Version="3.0.1" />
diff --git a/test/Microsoft.DocAsCode.Build.Common.Tests/Microsoft.DocAsCode.Build.Common.Tests.csproj b/test/Microsoft.DocAsCode.Build.Common.Tests/Microsoft.DocAsCode.Build.Common.Tests.csproj
index da34c481326..f2143ad6ec0 100644
--- a/test/Microsoft.DocAsCode.Build.Common.Tests/Microsoft.DocAsCode.Build.Common.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Build.Common.Tests/Microsoft.DocAsCode.Build.Common.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.DocAsCode.Build.Common\Microsoft.DocAsCode.Build.Common.csproj" />
     <ProjectReference Include="..\..\src\Microsoft.DocAsCode.Build.Engine\Microsoft.DocAsCode.Build.Engine.csproj" />
diff --git a/test/Microsoft.DocAsCode.Build.ConceptualDocuments.Tests/Microsoft.DocAsCode.Build.ConceptualDocuments.Tests.csproj b/test/Microsoft.DocAsCode.Build.ConceptualDocuments.Tests/Microsoft.DocAsCode.Build.ConceptualDocuments.Tests.csproj
index 13297a3d121..300c4efdea3 100644
--- a/test/Microsoft.DocAsCode.Build.ConceptualDocuments.Tests/Microsoft.DocAsCode.Build.ConceptualDocuments.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Build.ConceptualDocuments.Tests/Microsoft.DocAsCode.Build.ConceptualDocuments.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'net46' OR '$(TargetFramework)' == 'net452'">
     <Reference Include="System.Web" />
diff --git a/test/Microsoft.DocAsCode.Build.JavaScriptReference.Tests/Microsoft.DocAsCode.Build.JavaScriptReference.Tests.csproj b/test/Microsoft.DocAsCode.Build.JavaScriptReference.Tests/Microsoft.DocAsCode.Build.JavaScriptReference.Tests.csproj
index f6773698411..0f15ba3806e 100644
--- a/test/Microsoft.DocAsCode.Build.JavaScriptReference.Tests/Microsoft.DocAsCode.Build.JavaScriptReference.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Build.JavaScriptReference.Tests/Microsoft.DocAsCode.Build.JavaScriptReference.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\plugins\Microsoft.DocAsCode.Build.JavaScriptReference\Microsoft.DocAsCode.Build.JavaScriptReference.csproj" />
diff --git a/test/Microsoft.DocAsCode.Build.ManagedReference.Tests/Microsoft.DocAsCode.Build.ManagedReference.Tests.csproj b/test/Microsoft.DocAsCode.Build.ManagedReference.Tests/Microsoft.DocAsCode.Build.ManagedReference.Tests.csproj
index 7830961708d..6c606955a9e 100644
--- a/test/Microsoft.DocAsCode.Build.ManagedReference.Tests/Microsoft.DocAsCode.Build.ManagedReference.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Build.ManagedReference.Tests/Microsoft.DocAsCode.Build.ManagedReference.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <None Update="TestData\**">
diff --git a/test/Microsoft.DocAsCode.Build.ManagedReference.WithPlugins.Tests/Microsoft.DocAsCode.Build.ManagedReference.WithPlugins.Tests.csproj b/test/Microsoft.DocAsCode.Build.ManagedReference.WithPlugins.Tests/Microsoft.DocAsCode.Build.ManagedReference.WithPlugins.Tests.csproj
index d225625dd9a..fdcdb9d42bf 100644
--- a/test/Microsoft.DocAsCode.Build.ManagedReference.WithPlugins.Tests/Microsoft.DocAsCode.Build.ManagedReference.WithPlugins.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Build.ManagedReference.WithPlugins.Tests/Microsoft.DocAsCode.Build.ManagedReference.WithPlugins.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <None Update="TestData\**">
diff --git a/test/Microsoft.DocAsCode.Build.MergeOverwrite.Tests/Microsoft.DocAsCode.Build.MergeOverwrite.Tests.csproj b/test/Microsoft.DocAsCode.Build.MergeOverwrite.Tests/Microsoft.DocAsCode.Build.MergeOverwrite.Tests.csproj
index be2262cee63..3225cba45a3 100644
--- a/test/Microsoft.DocAsCode.Build.MergeOverwrite.Tests/Microsoft.DocAsCode.Build.MergeOverwrite.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Build.MergeOverwrite.Tests/Microsoft.DocAsCode.Build.MergeOverwrite.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <None Update="TestData\**\*.*">
diff --git a/test/Microsoft.DocAsCode.Build.RestApi.Tests/Microsoft.DocAsCode.Build.RestApi.Tests.csproj b/test/Microsoft.DocAsCode.Build.RestApi.Tests/Microsoft.DocAsCode.Build.RestApi.Tests.csproj
index 6a489a04820..f99623c44f2 100644
--- a/test/Microsoft.DocAsCode.Build.RestApi.Tests/Microsoft.DocAsCode.Build.RestApi.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Build.RestApi.Tests/Microsoft.DocAsCode.Build.RestApi.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <None Update="TestData\overwrite\rest.overwrite.tags.md;TestData\overwrite\rest.overwrite.unmergable.md;TestData\overwrite\rest.overwrite.multi.uid.md;TestData\overwrite\rest.overwrite.not.predefined.md;TestData\overwrite\rest.overwrite.parameters.md;TestData\overwrite\rest.overwrite.simple.md;TestData\overwrite\rest.overwrite.default.md;TestData\overwrite\rest.overwrite.invalid.md;TestData\overwrite\rest.overwrite.invalid.links.first.md;TestData\overwrite\rest.overwrite.invalid.links.second.md;TestData\overwrite\rest.overwrite.remarks.md;TestData\contacts-operations.md;TestData\swagger\contacts.json;TestData\swagger\contactsForExternalRef.json;TestData\swagger\externalLoopRef_A.json;TestData\swagger\externalLoopRef_B.json;TestData\swagger\externalRefNotExist.json;TestData\swagger\externalRefWithDefinition.json;TestData\swagger\externalRefWithRefInside.json;TestData\swagger\refWithRefInside.json;TestData\swagger\ref.json;TestData\swagger\loopref_swagger2.json;TestData\swagger\ref_swagger2.json;TestData\swagger\pathParameters_swagger2.json;TestData\swagger\tag_swagger2.json;TestData\swagger\simple_swagger2.json">
diff --git a/test/Microsoft.DocAsCode.Build.RestApi.WithPlugins.Tests/Microsoft.DocAsCode.Build.RestApi.WithPlugins.Tests.csproj b/test/Microsoft.DocAsCode.Build.RestApi.WithPlugins.Tests/Microsoft.DocAsCode.Build.RestApi.WithPlugins.Tests.csproj
index 468cd168490..0b5c4059c4c 100644
--- a/test/Microsoft.DocAsCode.Build.RestApi.WithPlugins.Tests/Microsoft.DocAsCode.Build.RestApi.WithPlugins.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Build.RestApi.WithPlugins.Tests/Microsoft.DocAsCode.Build.RestApi.WithPlugins.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <None Update="TestData\**">
diff --git a/test/Microsoft.DocAsCode.Build.SchemaDriven.Tests/Microsoft.DocAsCode.Build.SchemaDriven.Tests.csproj b/test/Microsoft.DocAsCode.Build.SchemaDriven.Tests/Microsoft.DocAsCode.Build.SchemaDriven.Tests.csproj
index 057b14c9565..836e098c999 100644
--- a/test/Microsoft.DocAsCode.Build.SchemaDriven.Tests/Microsoft.DocAsCode.Build.SchemaDriven.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Build.SchemaDriven.Tests/Microsoft.DocAsCode.Build.SchemaDriven.Tests.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
   </PropertyGroup>
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'net46' OR '$(TargetFramework)' == 'net452'">
     <Reference Include="System.Web" />
diff --git a/test/Microsoft.DocAsCode.Build.TableOfContents.Tests/Microsoft.DocAsCode.Build.TableOfContents.Tests.csproj b/test/Microsoft.DocAsCode.Build.TableOfContents.Tests/Microsoft.DocAsCode.Build.TableOfContents.Tests.csproj
index c2717181c61..1f5bea0d668 100644
--- a/test/Microsoft.DocAsCode.Build.TableOfContents.Tests/Microsoft.DocAsCode.Build.TableOfContents.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Build.TableOfContents.Tests/Microsoft.DocAsCode.Build.TableOfContents.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'net46' OR '$(TargetFramework)' == 'net452'">
     <Reference Include="System.Web" />
diff --git a/test/Microsoft.DocAsCode.Build.UniversalReference.Tests/Microsoft.DocAsCode.Build.UniversalReference.Tests.csproj b/test/Microsoft.DocAsCode.Build.UniversalReference.Tests/Microsoft.DocAsCode.Build.UniversalReference.Tests.csproj
index 3d996a9e086..cc9f5174d6d 100644
--- a/test/Microsoft.DocAsCode.Build.UniversalReference.Tests/Microsoft.DocAsCode.Build.UniversalReference.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Build.UniversalReference.Tests/Microsoft.DocAsCode.Build.UniversalReference.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
   
   <ItemGroup>
     <None Update="TestData\**">
diff --git a/test/Microsoft.DocAsCode.Common.Tests/Microsoft.DocAsCode.Common.Tests.csproj b/test/Microsoft.DocAsCode.Common.Tests/Microsoft.DocAsCode.Common.Tests.csproj
index 2c3bee48221..b556c5c2f9f 100644
--- a/test/Microsoft.DocAsCode.Common.Tests/Microsoft.DocAsCode.Common.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Common.Tests/Microsoft.DocAsCode.Common.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.DocAsCode.YamlSerialization\Microsoft.DocAsCode.YamlSerialization.csproj" />
diff --git a/test/Microsoft.DocAsCode.Dfm.Tests/Microsoft.DocAsCode.Dfm.Tests.csproj b/test/Microsoft.DocAsCode.Dfm.Tests/Microsoft.DocAsCode.Dfm.Tests.csproj
index 5d54b0a1fd3..e651a402e2d 100644
--- a/test/Microsoft.DocAsCode.Dfm.Tests/Microsoft.DocAsCode.Dfm.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Dfm.Tests/Microsoft.DocAsCode.Dfm.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.DocAsCode.YamlSerialization\Microsoft.DocAsCode.YamlSerialization.csproj" />
diff --git a/test/Microsoft.DocAsCode.Glob.Tests/Microsoft.DocAsCode.Glob.Tests.csproj b/test/Microsoft.DocAsCode.Glob.Tests/Microsoft.DocAsCode.Glob.Tests.csproj
index a94aadccd7b..beafafed80c 100644
--- a/test/Microsoft.DocAsCode.Glob.Tests/Microsoft.DocAsCode.Glob.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Glob.Tests/Microsoft.DocAsCode.Glob.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.DocAsCode.Glob\Microsoft.DocAsCode.Glob.csproj" />
diff --git a/test/Microsoft.DocAsCode.MarkdownLite.Tests/Microsoft.DocAsCode.MarkdownLite.Tests.csproj b/test/Microsoft.DocAsCode.MarkdownLite.Tests/Microsoft.DocAsCode.MarkdownLite.Tests.csproj
index 74b4b6347cc..21f4509ac99 100644
--- a/test/Microsoft.DocAsCode.MarkdownLite.Tests/Microsoft.DocAsCode.MarkdownLite.Tests.csproj
+++ b/test/Microsoft.DocAsCode.MarkdownLite.Tests/Microsoft.DocAsCode.MarkdownLite.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.DocAsCode.Plugins\Microsoft.DocAsCode.Plugins.csproj" />
diff --git a/test/Microsoft.DocAsCode.MarkdownRewriters.Tests/Microsoft.DocAsCode.MarkdownRewriters.Tests.csproj b/test/Microsoft.DocAsCode.MarkdownRewriters.Tests/Microsoft.DocAsCode.MarkdownRewriters.Tests.csproj
index e2f5ffd976a..53c29873959 100644
--- a/test/Microsoft.DocAsCode.MarkdownRewriters.Tests/Microsoft.DocAsCode.MarkdownRewriters.Tests.csproj
+++ b/test/Microsoft.DocAsCode.MarkdownRewriters.Tests/Microsoft.DocAsCode.MarkdownRewriters.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.DocAsCode.AzureMarkdownRewriters\Microsoft.DocAsCode.AzureMarkdownRewriters.csproj" />
diff --git a/test/Microsoft.DocAsCode.Metadata.ManagedReference.Tests/Microsoft.DocAsCode.Metadata.ManagedReference.Tests.csproj b/test/Microsoft.DocAsCode.Metadata.ManagedReference.Tests/Microsoft.DocAsCode.Metadata.ManagedReference.Tests.csproj
index 15f700b6efc..88953c46a5e 100644
--- a/test/Microsoft.DocAsCode.Metadata.ManagedReference.Tests/Microsoft.DocAsCode.Metadata.ManagedReference.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Metadata.ManagedReference.Tests/Microsoft.DocAsCode.Metadata.ManagedReference.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <None Update="TestData\filterconfig.yml;TestData\filterconfig_attribute.yml;TestData\System.Console.csyml;TestData\System.ConsoleColor.csyml;TestData\CatLibrary.dll;TestData\BaseClassForTestClass1.dll">
diff --git a/test/Microsoft.DocAsCode.Plugins.Tests/Microsoft.DocAsCode.Plugins.Tests.csproj b/test/Microsoft.DocAsCode.Plugins.Tests/Microsoft.DocAsCode.Plugins.Tests.csproj
index d2692577c94..de95ef7653c 100644
--- a/test/Microsoft.DocAsCode.Plugins.Tests/Microsoft.DocAsCode.Plugins.Tests.csproj
+++ b/test/Microsoft.DocAsCode.Plugins.Tests/Microsoft.DocAsCode.Plugins.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.DocAsCode.Plugins\Microsoft.DocAsCode.Plugins.csproj" />
diff --git a/test/Shared/test.base.props b/test/Shared/test.base.props
index a1a452896c4..a1e88e587d2 100644
--- a/test/Shared/test.base.props
+++ b/test/Shared/test.base.props
@@ -9,9 +9,9 @@
   <Import Project="../../src/Shared/base.props" />
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0-preview-20170810-02" />
-    <PackageReference Include="xunit" Version="2.3.0-beta4-build3742" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta4-build3742" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+    <PackageReference Include="xunit" Version="2.3.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
   </ItemGroup>
 
 </Project>
diff --git a/test/docfx.E2E.Tests/docfx.E2E.Tests.csproj b/test/docfx.E2E.Tests/docfx.E2E.Tests.csproj
index 3d22e2951c9..73494183c82 100644
--- a/test/docfx.E2E.Tests/docfx.E2E.Tests.csproj
+++ b/test/docfx.E2E.Tests/docfx.E2E.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <None Update="config.E2E.Tests.json">
diff --git a/test/docfx.Tests/docfx.Tests.csproj b/test/docfx.Tests/docfx.Tests.csproj
index b21b522dd70..a00d245c998 100644
--- a/test/docfx.Tests/docfx.Tests.csproj
+++ b/test/docfx.Tests/docfx.Tests.csproj
@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="..\Shared\test.base.props" />
+  <Import Project="..\Shared\test.base.netcoreapp.props" />
 
   <ItemGroup>
     <None Update="Assets\**">