Update to NUnit 3.13.1.

fscheck · Feb 23, 2021 · 5b2d1d2 · 5b2d1d2
1 parent f5cc961
commit 5b2d1d2
Show file tree

Hide file tree

Showing 18 changed files with 725 additions and 711 deletions.
diff --git a/FsCheck Release Notes.md b/FsCheck Release Notes.md
@@ -1,3 +1,9 @@
+### 2.15.0 - To be released
+
+* Update NUnit to 3.13.1, and set that as the lowest allowable version in FsCheck.NUnit package. Fix the ensuing
+
+* Since NUnit 3.13 no longer support netstandard 1.6, had to remove netstandard 1.6 support from FsCheck.NUnit as well.
+
 ### 2.14.6 - 21 February 2021
 
 * Restrict NUnit version range to versions < 3.13.1, as that introduced an incompatibility with FsCheck.NUnit.

diff --git a/examples/FsCheck.MsTest.Examples/App.config b/examples/FsCheck.MsTest.Examples/App.config
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <appSettings>
+    <add key="xunit.diagnosticMessages" value="false" />
+  </appSettings>
+
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
+
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <Paket>True</Paket>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/examples/FsCheck.MsTest.Examples/FsCheck.MsTest.Examples.csproj b/examples/FsCheck.MsTest.Examples/FsCheck.MsTest.Examples.csproj
@@ -7,6 +7,12 @@
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <WarningLevel>3</WarningLevel>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App.config" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\FsCheck\FsCheck.fsproj" />
   </ItemGroup>

diff --git a/examples/FsCheck.NUnit.CSharpExamples/App.config b/examples/FsCheck.NUnit.CSharpExamples/App.config
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <appSettings>
+    <add key="xunit.diagnosticMessages" value="false" />
+  </appSettings>
+
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
+
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <Paket>True</Paket>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/examples/FsCheck.NUnit.CSharpExamples/FsCheck.NUnit.CSharpExamples.csproj b/examples/FsCheck.NUnit.CSharpExamples/FsCheck.NUnit.CSharpExamples.csproj
@@ -2,11 +2,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>FsCheck.NUnit.CSharpExamples</AssemblyName>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFramework>net452</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <WarningLevel>3</WarningLevel>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App.config" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\FsCheck.NUnit\FsCheck.NUnit.fsproj" />
     <ProjectReference Include="..\..\src\FsCheck\FsCheck.fsproj" />

diff --git a/examples/FsCheck.NUnit.Examples/App.config b/examples/FsCheck.NUnit.Examples/App.config
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <appSettings>
+    <add key="xunit.diagnosticMessages" value="false" />
+  </appSettings>
+
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
+
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <Paket>True</Paket>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/examples/FsCheck.NUnit.Examples/FsCheck.NUnit.Examples.fsproj b/examples/FsCheck.NUnit.Examples/FsCheck.NUnit.Examples.fsproj
@@ -2,10 +2,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>FsCheck.NUnit.Examples</AssemblyName>
-    <TargetFrameworks>net452</TargetFrameworks>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFramework>net452</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
+    <Content Include="App.config" />
     <Compile Include="PropertyExamples.fs" />
     <None Include="paket.references" />
   </ItemGroup>

diff --git a/examples/FsCheck.XUnit.CSharpExamples/App.config b/examples/FsCheck.XUnit.CSharpExamples/App.config
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <appSettings>
+    <add key="xunit.diagnosticMessages" value="false" />
+  </appSettings>
+
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
+  </startup>
+
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <Paket>True</Paket>
+        <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="4.4.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>
diff --git a/examples/FsCheck.XUnit.CSharpExamples/FsCheck.XUnit.CSharpExamples.csproj b/examples/FsCheck.XUnit.CSharpExamples/FsCheck.XUnit.CSharpExamples.csproj
@@ -2,11 +2,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyName>FsCheck.Xunit.CSharpExamples</AssemblyName>
-    <TargetFrameworks>net452</TargetFrameworks>
+    <TargetFramework>net452</TargetFramework>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <WarningLevel>3</WarningLevel>
   </PropertyGroup>
+  <ItemGroup>
+    <None Remove="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="App.config" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\FsCheck.Xunit\FsCheck.Xunit.fsproj" />
     <ProjectReference Include="..\..\src\FsCheck\FsCheck.fsproj" />

diff --git a/paket.dependencies b/paket.dependencies
@@ -9,7 +9,7 @@ nuget FSharp.Core = 4.2.3
 nuget Unquote
 nuget xunit = 2.2
 nuget xunit.runner.visualstudio version_in_path: true
-nuget NUnit = 3.10.1
+nuget NUnit = 3.13.1
 nuget NUnit3TestAdapter version_in_path: true
 nuget MSTest.TestFramework
 nuget MSTest.TestAdapter version_in_path: true