Merge pull request #836 from jnyrup/ports

Port test framework projects to NetCore
fluentassertions · Apr 25, 2018 · 418842b · 418842b
2 parents 804defd + fbf4b17
commit 418842b
Show file tree

Hide file tree

Showing 15 changed files with 18 additions and 12 deletions.
diff --git a/FluentAssertions.sln b/FluentAssertions.sln
@@ -25,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AssemblyB", "Tests\Assembly
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestFrameworks", "TestFrameworks", "{4D8FA213-8724-4C43-B68A-F018148D238C}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnit2.Net45.Specs", "Tests\TestFrameworks\XUnit2.Net45.Specs\XUnit2.Net45.Specs.csproj", "{F50C8F77-3778-4432-84EC-B9B2B502E708}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XUnit2.Specs", "Tests\TestFrameworks\XUnit2.Specs\XUnit2.Specs.csproj", "{F50C8F77-3778-4432-84EC-B9B2B502E708}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Core", "Core", "{31891850-3EDC-480A-9B6C-F60540E9C90F}"
 EndProject
@@ -37,7 +37,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore.Specs", "Tests\NetC
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NetCore20.Specs", "Tests\NetCore20.Specs\NetCore20.Specs.csproj", "{1C7CF1BF-534B-4CF7-A3B2-5910B091460A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.Net45.Specs", "Tests\TestFrameworks\NUnit3.Net45.Specs\NUnit3.Net45.Specs.csproj", "{C8335EA3-C6CE-47C9-AB4F-CE37157E1EB2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.Specs", "Tests\TestFrameworks\NUnit3.Specs\NUnit3.Specs.csproj", "{C8335EA3-C6CE-47C9-AB4F-CE37157E1EB2}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit2.Net45.Specs", "Tests\TestFrameworks\NUnit2.Net45.Specs\NUnit2.Net45.Specs.csproj", "{53DAC943-ED58-4746-AAD7-D3E13CDA6099}"
 EndProject
@@ -49,7 +49,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSpec.Net45.Specs", "Tests\
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NSpec2.Net45.Specs", "Tests\TestFrameworks\NSpec2.Net45.Specs\NSpec2.Net45.Specs.csproj", "{CCC49B53-FD9A-4C36-8BFF-2407A0555A50}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSpec.Net45.Specs", "Tests\TestFrameworks\MSpec.Net45.Specs\MSpec.Net45.Specs.csproj", "{4F210C41-7E8E-424A-B956-FC1AA47663C9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MSpec.Specs", "Tests\TestFrameworks\MSpec.Specs\MSpec.Specs.csproj", "{4F210C41-7E8E-424A-B956-FC1AA47663C9}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Net47.Specs", "Tests\Net47.Specs\Net47.Specs.csproj", "{1E4EFB8D-FB8B-4EF2-83FC-B42D28CD99A3}"
 EndProject

diff --git a/...works/MSpec.Net45.Specs/FrameworkSpecs.cs → ...tFrameworks/MSpec.Specs/FrameworkSpecs.cs b/...works/MSpec.Net45.Specs/FrameworkSpecs.cs → ...tFrameworks/MSpec.Specs/FrameworkSpecs.cs
diff --git a/...Spec.Net45.Specs/MSpec.Net45.Specs.csproj → ...Frameworks/MSpec.Specs/MSpec.Specs.csproj b/...Spec.Net45.Specs/MSpec.Net45.Specs.csproj → ...Frameworks/MSpec.Specs/MSpec.Specs.csproj
@@ -1,13 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFrameworks>netcoreapp1.1</TargetFrameworks>
     <RootNamespace>MSpec.Specs</RootNamespace>
     <AssemblyName>MSpec.Specs</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Src\FluentAssertions\FluentAssertions.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="Machine.Specifications" Version="0.12.0" />
+    <PackageReference Include="Machine.Specifications.Runner.VisualStudio" Version="2.6.1" />
   </ItemGroup>
 </Project>
diff --git a/...Net45.Specs/MSpec.Specs.v2.ncrunchproject → ...MSpec.Specs/MSpec.Specs.v2.ncrunchproject b/...Net45.Specs/MSpec.Specs.v2.ncrunchproject → ...MSpec.Specs/MSpec.Specs.v2.ncrunchproject
diff --git a/...Specs/MSpec.Net45.Specs.v3.ncrunchproject → ...MSpec.Specs/MSpec.Specs.v3.ncrunchproject b/...Specs/MSpec.Net45.Specs.v3.ncrunchproject → ...MSpec.Specs/MSpec.Specs.v3.ncrunchproject
diff --git a/Tests/TestFrameworks/NUnit2.Net45.Specs/NUnit2.Net45.Specs.csproj b/Tests/TestFrameworks/NUnit2.Net45.Specs/NUnit2.Net45.Specs.csproj
@@ -8,6 +8,8 @@
     <ProjectReference Include="..\..\..\Src\FluentAssertions\FluentAssertions.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="NUnit" Version="2.6.4" />
+    <PackageReference Include="NUnitTestAdapter" Version="2.1.1" />
   </ItemGroup>
 </Project>
diff --git a/...orks/NUnit3.Net45.Specs/FrameworkSpecs.cs → ...Frameworks/NUnit3.Specs/FrameworkSpecs.cs b/...orks/NUnit3.Net45.Specs/FrameworkSpecs.cs → ...Frameworks/NUnit3.Specs/FrameworkSpecs.cs
diff --git a/...it3.Net45.Specs/NUnit3.Net45.Specs.csproj → ...ameworks/NUnit3.Specs/NUnit3.Specs.csproj b/...it3.Net45.Specs/NUnit3.Net45.Specs.csproj → ...ameworks/NUnit3.Specs/NUnit3.Specs.csproj
@@ -1,13 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
     <RootNamespace>NUnit3.Specs</RootNamespace>
     <AssemblyName>NUnit3.Specs</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Src\FluentAssertions\FluentAssertions.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="NUnit" Version="3.9.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
   </ItemGroup>
 </Project>
diff --git a/...et45.Specs/NUnit3.Specs.v2.ncrunchproject → ...nit3.Specs/NUnit3.Specs.v2.ncrunchproject b/...et45.Specs/NUnit3.Specs.v2.ncrunchproject → ...nit3.Specs/NUnit3.Specs.v2.ncrunchproject
diff --git a/...pecs/NUnit3.Net45.Specs.v3.ncrunchproject → ...nit3.Specs/NUnit3.Specs.v3.ncrunchproject b/...pecs/NUnit3.Net45.Specs.v3.ncrunchproject → ...nit3.Specs/NUnit3.Specs.v3.ncrunchproject
diff --git a/...orks/XUnit2.Net45.Specs/FrameworkSpecs.cs → ...Frameworks/XUnit2.Specs/FrameworkSpecs.cs b/...orks/XUnit2.Net45.Specs/FrameworkSpecs.cs → ...Frameworks/XUnit2.Specs/FrameworkSpecs.cs
diff --git a/...it2.Net45.Specs/XUnit2.Net45.Specs.csproj → ...ameworks/XUnit2.Specs/XUnit2.Specs.csproj b/...it2.Net45.Specs/XUnit2.Net45.Specs.csproj → ...ameworks/XUnit2.Specs/XUnit2.Specs.csproj
@@ -1,13 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFramework>netcoreapp1.1</TargetFramework>
     <RootNamespace>XUnit2.Specs</RootNamespace>
     <AssemblyName>XUnit2.Specs</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Src\FluentAssertions\FluentAssertions.csproj" />
   </ItemGroup>
   <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.3.0" />
     <PackageReference Include="xunit" Version="2.3.0-beta5-build3769" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.0-beta5-build3769" />
+    <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0-beta5-build3769" />
   </ItemGroup>
 </Project>
diff --git a/...et45.Specs/XUnit2.Specs.v2.ncrunchproject → ...nit2.Specs/XUnit2.Specs.v2.ncrunchproject b/...et45.Specs/XUnit2.Specs.v2.ncrunchproject → ...nit2.Specs/XUnit2.Specs.v2.ncrunchproject
diff --git a/...pecs/XUnit2.Net45.Specs.v3.ncrunchproject → ...nit2.Specs/XUnit2.Specs.v3.ncrunchproject b/...pecs/XUnit2.Net45.Specs.v3.ncrunchproject → ...nit2.Specs/XUnit2.Specs.v3.ncrunchproject
diff --git a/build.cake b/build.cake
@@ -1,10 +1,7 @@
 #tool "nuget:?package=xunit.runner.console&version=2.3.0-beta5-build3769"
-#tool "nuget:?package=nunit.runners&version=2.6.4"
-#tool "nuget:?package=nunit.consolerunner&version=3.7.0"
 #tool "nuget:?package=nspec&version=1.0.13"
 #tool "nuget:?package=nspec&version=2.0.1"
 #tool "nuget:?package=nspec&version=3.1.0"
-#tool "nuget:?package=Machine.Specifications.Runner.Console&version=0.9.3"
 #tool "nuget:?package=GitVersion.CommandLine"
 
 //////////////////////////////////////////////////////////////////////
@@ -91,16 +88,16 @@ Task("Run-Unit-Tests")
     DotNetCoreTool("./Tests/NetCore13.Specs/NetCore13.Specs.csproj", "xunit", "-configuration debug");
     DotNetCoreTool("./Tests/NetCore20.Specs/NetCore.Specs20.csproj", "xunit", "-configuration debug");
 
+    DotNetCoreTest("./Tests/TestFrameworks/MSpec.Specs/MSpec.Specs.csproj", new DotNetCoreTestSettings { Configuration = "Debug" });
     DotNetCoreTest("./Tests/TestFrameworks/MSTestV2.Specs/MSTestV2.Specs.csproj", new DotNetCoreTestSettings { Configuration = "Debug" });
+    DotNetCoreTest("./Tests/TestFrameworks/NUnit3.Specs/NUnit3.Specs.csproj", new DotNetCoreTestSettings { Configuration = "Debug" });
+    DotNetCoreTool("./Tests/TestFrameworks/XUnit2.Specs/XUnit2.Specs.csproj", "xunit", "-configuration debug");
     XUnit2("./Tests/TestFrameworks/XUnit.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new XUnit2Settings { });
-    XUnit2("./Tests/TestFrameworks/XUnit2.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new XUnit2Settings { });
     NUnit("./Tests/TestFrameworks/NUnit2.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new NUnitSettings { NoResults = true });
-    NUnit3("./Tests/TestFrameworks/NUnit3.Net45.Specs/**/bin/Debug/**/*.Specs.dll", new NUnit3Settings { NoResults = true });
 
     StartProcess(Context.Tools.Resolve("nspec.1.*/**/NSpecRunner.exe"), "./Tests/TestFrameworks/NSpec.Net45.Specs/bin/Debug/net451/NSpec.Specs.dll");
     StartProcess(Context.Tools.Resolve("nspec.2.*/**/NSpecRunner.exe"), "./Tests/TestFrameworks/NSpec2.Net45.Specs/bin/Debug/net451/NSpec2.Specs.dll");
     StartProcess(Context.Tools.Resolve("nspec.3.*/**/NSpecRunner.exe"), "./Tests/TestFrameworks/NSpec3.Net45.Specs/bin/Debug/net451/NSpec3.Specs.dll");
-    StartProcess(Context.Tools.Resolve("mspec-clr4.exe"), "./Tests/TestFrameworks/MSpec.Net45.Specs/bin/Debug/net451/MSpec.Specs.dll");
 });
 
 Task("Pack")