Update dotnet projects deps

MMAll.dotnet.sln

@@ -9,26 +9,77 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MMManaged.Engine.dotnet", "
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "MMTricks.dotnet", "MMTricks\MMTricks.dotnet.fsproj", "{AD894349-DD65-422F-80D1-0ED6F0052352}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Test.MMManaged", "Test.MMManaged", "{85668528-03F4-B288-F945-BE32D0B70172}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Test.MMManaged.dotnet", "Test.MMManaged\Test.MMManaged.dotnet.fsproj", "{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MMManaged", "MMManaged", "{37F5B070-522D-8A86-D531-383028BDEC25}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MMManaged.Engine", "MMManaged.Engine", "{F7C3C4EB-1C6D-EC69-B8CC-4A1C72D613D4}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
 		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Debug|x64.Build.0 = Debug|Any CPU
+		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Debug|x86.Build.0 = Debug|Any CPU
 		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Release|x64.ActiveCfg = Release|Any CPU
+		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Release|x64.Build.0 = Release|Any CPU
+		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Release|x86.ActiveCfg = Release|Any CPU
+		{C6097DB3-F08B-4F18-9E9F-F87E4FE3C99B}.Release|x86.Build.0 = Release|Any CPU
 		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Debug|x64.Build.0 = Debug|Any CPU
+		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Debug|x86.Build.0 = Debug|Any CPU
 		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Release|x64.ActiveCfg = Release|Any CPU
+		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Release|x64.Build.0 = Release|Any CPU
+		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Release|x86.ActiveCfg = Release|Any CPU
+		{91E5FD7F-68BC-40F6-BFBE-549F0B82C671}.Release|x86.Build.0 = Release|Any CPU
 		{AD894349-DD65-422F-80D1-0ED6F0052352}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{AD894349-DD65-422F-80D1-0ED6F0052352}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AD894349-DD65-422F-80D1-0ED6F0052352}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{AD894349-DD65-422F-80D1-0ED6F0052352}.Debug|x64.Build.0 = Debug|Any CPU
+		{AD894349-DD65-422F-80D1-0ED6F0052352}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AD894349-DD65-422F-80D1-0ED6F0052352}.Debug|x86.Build.0 = Debug|Any CPU
 		{AD894349-DD65-422F-80D1-0ED6F0052352}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{AD894349-DD65-422F-80D1-0ED6F0052352}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AD894349-DD65-422F-80D1-0ED6F0052352}.Release|x64.ActiveCfg = Release|Any CPU
+		{AD894349-DD65-422F-80D1-0ED6F0052352}.Release|x64.Build.0 = Release|Any CPU
+		{AD894349-DD65-422F-80D1-0ED6F0052352}.Release|x86.ActiveCfg = Release|Any CPU
+		{AD894349-DD65-422F-80D1-0ED6F0052352}.Release|x86.Build.0 = Release|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Debug|x64.Build.0 = Debug|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Debug|x86.Build.0 = Debug|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Release|x64.ActiveCfg = Release|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Release|x64.Build.0 = Release|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Release|x86.ActiveCfg = Release|Any CPU
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{EA2B29BE-C09B-40A0-A7CB-0993F035ADAD} = {85668528-03F4-B288-F945-BE32D0B70172}
 	EndGlobalSection
 EndGlobal

MMManaged/MMManaged.dotnet.fsproj

@@ -1,37 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>net462</TargetFramework>
     <AssemblyName>MMManaged</AssemblyName>
     <RootNamespace>Library1</RootNamespace>
-
     <!-- Preserve original output layout: ..\Debug\ and ..\Release\ at solution root,
          not the SDK default of bin\<Configuration>\<TargetFramework>\ -->
     <OutputPath>..\$(Configuration)\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-
     <DocumentationFile>$(OutputPath)Library1.XML</DocumentationFile>
-
     <!-- AssemblyInfo.fs is included in source, don't let SDK auto-generate one -->
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-
     <!-- F#-specific: keep tail-call behavior matching original per-config -->
     <Tailcalls Condition="'$(Configuration)' == 'Debug'">false</Tailcalls>
     <Tailcalls Condition="'$(Configuration)' == 'Release'">true</Tailcalls>
   </PropertyGroup>
-
-<PropertyGroup>
-  <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
-</PropertyGroup>
-<ItemGroup>
-  <Reference Include="FSharp.Core">
-    <HintPath>..\FSharp.Core.4.4.3.0\FSharp.Core.dll</HintPath>
-    <Private>False</Private>
-  </Reference>
-</ItemGroup>
-
+  <PropertyGroup>
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="FSharp.Core">
+      <HintPath>..\FSharp.Core.4.4.3.0\FSharp.Core.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
+  </ItemGroup>
   <!-- F# compilation order is significant - keep this list in dependency order -->
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
@@ -43,33 +37,18 @@
     <Compile Include="EngineInstance.fs" />
     <Compile Include="Interop.fs" />
   </ItemGroup>
-
   <ItemGroup>
     <Content Include="paket.references" />
     <Content Include="packages.config" />
     <None Include="LoadInFSI.fsx" />
     <None Include="TestFSI.fsx" />
     <None Include="Program.fs" />
   </ItemGroup>
-
   <!-- Reference assemblies for net462 - required for non-Windows builds.
        Harmless on Windows (where the targeting pack is also present). -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies"
-                      Version="1.0.3" PrivateAssets="All" />
-  </ItemGroup>
-
-  <!-- Package references replacing the old HintPath-style references.
-       If you keep using Paket, delete this ItemGroup and let Paket inject
-       references via the Import below. If you want to switch off Paket,
-       keep these and remove the Import. -->
-  <ItemGroup>
-    <PackageReference Include="FsPickler" Version="5.3.2" />
-    <PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.*" />
-    <PackageReference Include="YamlDotNet" Version="*" />
-    <!-- SharpDX assemblies come transitively from MonoGame.Framework.WindowsDX -->
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
   </ItemGroup>
-
   <ItemGroup>
     <Reference Include="MonoGame.Framework">
       <HintPath>..\packages\MonoGame.Framework.WindowsDX\lib\net40\MonoGame.Framework.dll</HintPath>
@@ -90,10 +69,7 @@
       <HintPath>..\packages\YamlDotNet\lib\net35\YamlDotNet.dll</HintPath>
     </Reference>
   </ItemGroup>
-
   <!-- Paket integration: this injects references from paket.references at build time.
        Path assumes .paket/ is one directory up (solution root). Adjust if different. -->
-  <Import Project="..\.paket\Paket.Restore.targets"
-          Condition="Exists('..\.paket\Paket.Restore.targets')" />
-
-</Project>
+  <Import Project="..\.paket\Paket.Restore.targets" />
+</Project>

Test.MMManaged/Directory.Build.targets

@@ -0,0 +1,8 @@
+<!-- workaround for paket insisting on changing this after a paket install; 
+     which generates a build warning 
+-->
+<Project>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+</Project>

Test.MMManaged/Test.MMManaged.dotnet.fsproj

@@ -1,27 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFramework>net462</TargetFramework>
     <AssemblyName>Test.MMManaged</AssemblyName>
     <RootNamespace>Test.MMManaged</RootNamespace>
-
     <!-- Match original output layout -->
     <OutputPath>..\$(Configuration)\</OutputPath>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-
     <DocumentationFile>$(OutputPath)Test.MMManaged.XML</DocumentationFile>
-
     <!-- F# tail-call behavior, matching original per-config settings -->
     <Tailcalls Condition="'$(Configuration)' == 'Debug'">false</Tailcalls>
     <Tailcalls Condition="'$(Configuration)' == 'Release'">true</Tailcalls>
-
     <!-- Required for `dotnet test` to discover and run NUnit tests -->
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
-
   <PropertyGroup>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
   </PropertyGroup>
@@ -31,7 +27,6 @@
       <Private>False</Private>
     </Reference>
   </ItemGroup>
-
   <!-- F# compilation order is significant - keep this list in dependency order -->
   <ItemGroup>
     <Compile Include="Program.fs" />
@@ -44,27 +39,21 @@
     <Compile Include="TestWriters.fs" />
     <Compile Include="TestMeshRelation.fs" />
   </ItemGroup>
-
   <ItemGroup>
     <None Include="App.config" />
     <Content Include="paket.references" />
   </ItemGroup>
-
   <!-- Reference assemblies for net462 - required for non-Windows builds -->
   <ItemGroup>
-    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies"
-                      Version="1.0.3" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" PrivateAssets="All" />
   </ItemGroup>
-
   <!-- Test runner integration: lets `dotnet test` discover and run the NUnit tests.
        Original tests were authored against NUnit 2 but only use Assert.IsTrue /
        Assert.AreEqual, which carry over unchanged to NUnit 3. -->
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
-    <PackageReference Include="NUnit" Version="3.*" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.*" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\MMManaged\MMManaged.dotnet.fsproj">
       <Private>True</Private>
@@ -73,7 +62,6 @@
       <Private>True</Private>
     </ProjectReference>
   </ItemGroup>
-
   <!-- Package dependencies via HintPath into the existing packages folder.
        Matches the pattern used by MMManaged.dotnet.fsproj. -->
   <ItemGroup>
@@ -96,9 +84,6 @@
          FsUnit was listed in paket.references but no test code uses it,
          so it's intentionally omitted here. -->
   </ItemGroup>
-
   <!-- Paket integration: harmless if file doesn't exist. -->
-  <Import Project="..\.paket\Paket.Restore.targets"
-          Condition="Exists('..\.paket\Paket.Restore.targets')" />
-
-</Project>
+  <Import Project="..\.paket\Paket.Restore.targets" />
+</Project>

Test.MMManaged/Test.MMManaged.fsproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\NUnit\build\NUnit.props" Condition="Exists('..\packages\NUnit\build\NUnit.props')" Label="Paket" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -39,9 +40,6 @@
     <Prefer32Bit>true</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="FSharp.Core">
-      <HintPath>..\FSharp.Core.4.4.3.0\FSharp.Core.dll</HintPath>
-    </Reference>
     <Reference Include="mscorlib" />
     <Reference Include="SharpDX">
       <HintPath>..\packages\MonoGame.Framework.WindowsDX\lib\net40\SharpDX.dll</HintPath>
@@ -113,10 +111,29 @@
   </Target>
   -->
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')" />
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8' Or $(TargetFrameworkVersion) == 'v4.8.1')">
+      <ItemGroup>
+        <Reference Include="FSharp.Core">
+          <HintPath>..\packages\FSharp.Core\lib\net45\FSharp.Core.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
+  </Choose>
+  <Choose>
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8' Or $(TargetFrameworkVersion) == 'v4.8.1')">
+      <ItemGroup>
+        <Reference Include="FsUnit.NUnit">
+          <HintPath>..\packages\FsUnit\lib\net46\FsUnit.NUnit.dll</HintPath>
+          <Private>True</Private>
+          <Paket>True</Paket>
+        </Reference>
+      </ItemGroup>
+    </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8' Or $(TargetFrameworkVersion) == 'v4.8.1')">
       <ItemGroup>
         <Reference Include="MonoGame.Framework">
           <HintPath>..\packages\MonoGame.Framework.WindowsDX\lib\net40\MonoGame.Framework.dll</HintPath>
@@ -127,10 +144,10 @@
     </When>
   </Choose>
   <Choose>
-    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8')">
+    <When Condition="$(TargetFrameworkIdentifier) == '.NETFramework' And ($(TargetFrameworkVersion) == 'v4.5' Or $(TargetFrameworkVersion) == 'v4.5.1' Or $(TargetFrameworkVersion) == 'v4.5.2' Or $(TargetFrameworkVersion) == 'v4.5.3' Or $(TargetFrameworkVersion) == 'v4.6' Or $(TargetFrameworkVersion) == 'v4.6.1' Or $(TargetFrameworkVersion) == 'v4.6.2' Or $(TargetFrameworkVersion) == 'v4.6.3' Or $(TargetFrameworkVersion) == 'v4.7' Or $(TargetFrameworkVersion) == 'v4.7.1' Or $(TargetFrameworkVersion) == 'v4.7.2' Or $(TargetFrameworkVersion) == 'v4.8' Or $(TargetFrameworkVersion) == 'v4.8.1')">
       <ItemGroup>
         <Reference Include="nunit.framework">
-          <HintPath>..\packages\NUnit\lib\nunit.framework.dll</HintPath>
+          <HintPath>..\packages\NUnit\lib\net45\nunit.framework.dll</HintPath>
           <Private>True</Private>
           <Paket>True</Paket>
         </Reference>

build.fsx

@@ -219,12 +219,15 @@ Target "BuildTest" (fun _ ->
       |> Log "BuildTest-Output: "
 )
 
+open Fake.Testing
 Target "Test" (fun _ ->
     !! (testDir + "/Test.*.dll")
-      |> NUnit (fun p ->
-          {p with
-             DisableShadowCopy = true;
-             OutputFile = testDir + "/Test.Results.xml" })
+        |> NUnit3 (fun p ->
+            { p with
+                ToolPath = "packages/NUnit.ConsoleRunner/tools/nunit3-console.exe"
+                ShadowCopy = false
+                Labels = LabelsLevel.All
+                ResultSpecs = [testDir + "/Test.Results.xml"] })
 )
 
 Target "CopyNative" (fun _ ->
@@ -341,7 +344,7 @@ Target "SignBuild" (fun _ ->
 
     try
         File.WriteAllText(passFile,pass)
-        SignTool @"C:\Program Files\Windows Kits\8.1\bin\x64" certPath passFile files
+        SignTool @"C:\Program Files\Windows Kits\8.1\bin\x64" certPath (Some passFile) files
         File.Delete passFile
     with
         | e ->