Switch remaining test projects over to netcoreapp2.0 (and use compati…

…ble versions of Microsoft.NET.Test.Sdk and Xunit). dotnet#1963
tintoy · Nov 26, 2017 · b595464 · b595464
1 parent 4f800e2
commit b595464
Show file tree

Hide file tree

Showing 23 changed files with 27 additions and 25 deletions.
diff --git 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
@@ -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
@@ -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/...uild.ConceptualDocuments.Tests/Microsoft.DocAsCode.Build.ConceptualDocuments.Tests.csproj b/...uild.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/...uild.JavaScriptReference.Tests/Microsoft.DocAsCode.Build.JavaScriptReference.Tests.csproj b/...uild.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/...Code.Build.ManagedReference.Tests/Microsoft.DocAsCode.Build.ManagedReference.Tests.csproj b/...Code.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/...nce.WithPlugins.Tests/Microsoft.DocAsCode.Build.ManagedReference.WithPlugins.Tests.csproj b/...nce.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/...ocAsCode.Build.MergeOverwrite.Tests/Microsoft.DocAsCode.Build.MergeOverwrite.Tests.csproj b/...ocAsCode.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
@@ -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/...uild.RestApi.WithPlugins.Tests/Microsoft.DocAsCode.Build.RestApi.WithPlugins.Tests.csproj b/...uild.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/...ft.DocAsCode.Build.SchemaDriven.Tests/Microsoft.DocAsCode.Build.SchemaDriven.Tests.csproj b/...ft.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/...AsCode.Build.TableOfContents.Tests/Microsoft.DocAsCode.Build.TableOfContents.Tests.csproj b/...AsCode.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/....Build.UniversalReference.Tests/Microsoft.DocAsCode.Build.UniversalReference.Tests.csproj b/....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
@@ -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
@@ -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
@@ -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
@@ -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/...soft.DocAsCode.MarkdownRewriters.Tests/Microsoft.DocAsCode.MarkdownRewriters.Tests.csproj b/...soft.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/...etadata.ManagedReference.Tests/Microsoft.DocAsCode.Metadata.ManagedReference.Tests.csproj b/...etadata.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
@@ -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
@@ -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
@@ -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
@@ -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\**">