Tests can now be built for net472

demystifyfp · Aug 29, 2020 · 9850140 · 9850140
1 parent 491c4e5
commit 9850140
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 38 deletions.
diff --git a/paket.dependencies b/paket.dependencies
@@ -5,16 +5,15 @@ storage: none
 nuget FSharp.Core 4.6.2
 nuget Hopac
 nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
-nuget Microsoft.NETFramework.ReferenceAssemblies copy_local: true # allows for building full framework on macOS/linux without mono
 nuget Ply
 
 group Test
 source https://api.nuget.org/v3/index.json
-
 storage: none
 nuget Expecto
 nuget Expecto.Hopac
 nuget Fable.Mocha
+nuget Microsoft.NETFramework.ReferenceAssemblies copy_local: true # allows for building full framework on macOS/linux without mono
 
 group Build
 source https://api.nuget.org/v3/index.json

diff --git a/paket.lock b/paket.lock
@@ -32,31 +32,6 @@ NUGET
     Microsoft.Build.Tasks.Git (1.1.0-beta-20204-02) - copy_local: true
     Microsoft.NETCore.Platforms (3.1) - restriction: || (&& (>= net45) (< netstandard1.3) (>= netstandard1.6)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.4) (>= netstandard1.6)) (&& (>= net461) (>= netstandard1.6)) (>= netcoreapp2.0) (&& (>= netcoreapp5.0) (< netstandard2.0)) (&& (< netstandard1.0) (>= netstandard1.6) (< portable-net45+win8)) (&& (< netstandard1.0) (>= netstandard1.6) (>= win8)) (&& (< netstandard1.0) (>= netstandard1.6) (< win8)) (&& (< netstandard1.3) (>= netstandard1.6) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (>= netstandard1.6) (< portable-net45+win8+wpa81)) (&& (>= netstandard1.6) (>= uap10.1)) (&& (>= netstandard1.6) (>= wp8))
     Microsoft.NETCore.Targets (3.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (>= netcoreapp5.0) (< netstandard2.0))
-    Microsoft.NETFramework.ReferenceAssemblies (1.0) - copy_local: true
-      Microsoft.NETFramework.ReferenceAssemblies.net20 (>= 1.0) - restriction: && (>= net20) (< net40)
-      Microsoft.NETFramework.ReferenceAssemblies.net40 (>= 1.0) - restriction: && (>= net40) (< net45)
-      Microsoft.NETFramework.ReferenceAssemblies.net45 (>= 1.0) - restriction: && (>= net45) (< net451)
-      Microsoft.NETFramework.ReferenceAssemblies.net451 (>= 1.0) - restriction: && (>= net451) (< net452)
-      Microsoft.NETFramework.ReferenceAssemblies.net452 (>= 1.0) - restriction: && (>= net452) (< net46)
-      Microsoft.NETFramework.ReferenceAssemblies.net46 (>= 1.0) - restriction: && (>= net46) (< net461)
-      Microsoft.NETFramework.ReferenceAssemblies.net461 (>= 1.0) - restriction: && (>= net461) (< net462)
-      Microsoft.NETFramework.ReferenceAssemblies.net462 (>= 1.0) - restriction: && (>= net462) (< net47)
-      Microsoft.NETFramework.ReferenceAssemblies.net47 (>= 1.0) - restriction: && (>= net47) (< net471)
-      Microsoft.NETFramework.ReferenceAssemblies.net471 (>= 1.0) - restriction: && (>= net471) (< net472)
-      Microsoft.NETFramework.ReferenceAssemblies.net472 (>= 1.0) - restriction: && (>= net472) (< net48)
-      Microsoft.NETFramework.ReferenceAssemblies.net48 (>= 1.0) - restriction: >= net48
-    Microsoft.NETFramework.ReferenceAssemblies.net20 (1.0) - copy_local: true, restriction: && (>= net20) (< net40)
-    Microsoft.NETFramework.ReferenceAssemblies.net40 (1.0) - copy_local: true, restriction: && (>= net40) (< net45)
-    Microsoft.NETFramework.ReferenceAssemblies.net45 (1.0) - copy_local: true, restriction: && (>= net45) (< net451)
-    Microsoft.NETFramework.ReferenceAssemblies.net451 (1.0) - copy_local: true, restriction: && (>= net451) (< net452)
-    Microsoft.NETFramework.ReferenceAssemblies.net452 (1.0) - copy_local: true, restriction: && (>= net452) (< net46)
-    Microsoft.NETFramework.ReferenceAssemblies.net46 (1.0) - copy_local: true, restriction: && (>= net46) (< net461)
-    Microsoft.NETFramework.ReferenceAssemblies.net461 (1.0) - copy_local: true, restriction: && (>= net461) (< net462)
-    Microsoft.NETFramework.ReferenceAssemblies.net462 (1.0) - copy_local: true, restriction: && (>= net462) (< net47)
-    Microsoft.NETFramework.ReferenceAssemblies.net47 (1.0) - copy_local: true, restriction: && (>= net47) (< net471)
-    Microsoft.NETFramework.ReferenceAssemblies.net471 (1.0) - copy_local: true, restriction: && (>= net471) (< net472)
-    Microsoft.NETFramework.ReferenceAssemblies.net472 (1.0) - copy_local: true, restriction: && (>= net472) (< net48)
-    Microsoft.NETFramework.ReferenceAssemblies.net48 (1.0) - copy_local: true, restriction: >= net48
     Microsoft.SourceLink.Common (1.1.0-beta-20204-02) - copy_local: true
     Microsoft.SourceLink.GitHub (1.1.0-beta-20204-02) - copy_local: true
       Microsoft.Build.Tasks.Git (>= 1.1.0-beta-20204-02)
@@ -1343,4 +1318,29 @@ NUGET
     FSharp.Core (4.7.1) - restriction: || (>= net461) (>= netstandard2.0)
     Hopac (0.4.1) - restriction: || (>= net461) (>= netstandard2.0)
       FSharp.Core (>= 4.5 < 5.0) - restriction: >= netstandard2.0
+    Microsoft.NETFramework.ReferenceAssemblies (1.0) - copy_local: true
+      Microsoft.NETFramework.ReferenceAssemblies.net20 (>= 1.0) - restriction: && (>= net20) (< net40)
+      Microsoft.NETFramework.ReferenceAssemblies.net40 (>= 1.0) - restriction: && (>= net40) (< net45)
+      Microsoft.NETFramework.ReferenceAssemblies.net45 (>= 1.0) - restriction: && (>= net45) (< net451)
+      Microsoft.NETFramework.ReferenceAssemblies.net451 (>= 1.0) - restriction: && (>= net451) (< net452)
+      Microsoft.NETFramework.ReferenceAssemblies.net452 (>= 1.0) - restriction: && (>= net452) (< net46)
+      Microsoft.NETFramework.ReferenceAssemblies.net46 (>= 1.0) - restriction: && (>= net46) (< net461)
+      Microsoft.NETFramework.ReferenceAssemblies.net461 (>= 1.0) - restriction: && (>= net461) (< net462)
+      Microsoft.NETFramework.ReferenceAssemblies.net462 (>= 1.0) - restriction: && (>= net462) (< net47)
+      Microsoft.NETFramework.ReferenceAssemblies.net47 (>= 1.0) - restriction: && (>= net47) (< net471)
+      Microsoft.NETFramework.ReferenceAssemblies.net471 (>= 1.0) - restriction: && (>= net471) (< net472)
+      Microsoft.NETFramework.ReferenceAssemblies.net472 (>= 1.0) - restriction: && (>= net472) (< net48)
+      Microsoft.NETFramework.ReferenceAssemblies.net48 (>= 1.0) - restriction: >= net48
+    Microsoft.NETFramework.ReferenceAssemblies.net20 (1.0) - copy_local: true, restriction: && (>= net20) (< net40)
+    Microsoft.NETFramework.ReferenceAssemblies.net40 (1.0) - copy_local: true, restriction: && (>= net40) (< net45)
+    Microsoft.NETFramework.ReferenceAssemblies.net45 (1.0) - copy_local: true, restriction: && (>= net45) (< net451)
+    Microsoft.NETFramework.ReferenceAssemblies.net451 (1.0) - copy_local: true, restriction: && (>= net451) (< net452)
+    Microsoft.NETFramework.ReferenceAssemblies.net452 (1.0) - copy_local: true, restriction: && (>= net452) (< net46)
+    Microsoft.NETFramework.ReferenceAssemblies.net46 (1.0) - copy_local: true, restriction: && (>= net46) (< net461)
+    Microsoft.NETFramework.ReferenceAssemblies.net461 (1.0) - copy_local: true, restriction: && (>= net461) (< net462)
+    Microsoft.NETFramework.ReferenceAssemblies.net462 (1.0) - copy_local: true, restriction: && (>= net462) (< net47)
+    Microsoft.NETFramework.ReferenceAssemblies.net47 (1.0) - copy_local: true, restriction: && (>= net47) (< net471)
+    Microsoft.NETFramework.ReferenceAssemblies.net471 (1.0) - copy_local: true, restriction: && (>= net471) (< net472)
+    Microsoft.NETFramework.ReferenceAssemblies.net472 (1.0) - copy_local: true, restriction: && (>= net472) (< net48)
+    Microsoft.NETFramework.ReferenceAssemblies.net48 (1.0) - copy_local: true, restriction: >= net48
     Mono.Cecil (0.11.2) - restriction: || (>= net461) (>= netstandard2.0)
diff --git a/src/FsToolkit.ErrorHandling.JobResult/paket.references b/src/FsToolkit.ErrorHandling.JobResult/paket.references
@@ -1,3 +1,2 @@
 Microsoft.SourceLink.GitHub
-Hopac
-Microsoft.NETFramework.ReferenceAssemblies
+Hopac
diff --git a/src/FsToolkit.ErrorHandling.TaskResult/paket.references b/src/FsToolkit.ErrorHandling.TaskResult/paket.references
@@ -1,3 +1,2 @@
 Ply
 Microsoft.SourceLink.GitHub
-Microsoft.NETFramework.ReferenceAssemblies
diff --git a/src/FsToolkit.ErrorHandling/paket.references b/src/FsToolkit.ErrorHandling/paket.references
@@ -1,3 +1,2 @@
 FSharp.Core
-Microsoft.SourceLink.GitHub
-Microsoft.NETFramework.ReferenceAssemblies
+Microsoft.SourceLink.GitHub
diff --git a/tests/FsToolkit.ErrorHandling.JobResult.Tests/FsToolkit.ErrorHandling.JobResult.Tests.fsproj b/tests/FsToolkit.ErrorHandling.JobResult.Tests/FsToolkit.ErrorHandling.JobResult.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp5.0;net472</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <LangVersion>preview</LangVersion>

diff --git a/tests/FsToolkit.ErrorHandling.JobResult.Tests/paket.references b/tests/FsToolkit.ErrorHandling.JobResult.Tests/paket.references
@@ -1,3 +1,4 @@
 group Test
 Expecto
-Expecto.Hopac
+Expecto.Hopac
+Microsoft.NETFramework.ReferenceAssemblies
diff --git a/.../FsToolkit.ErrorHandling.TaskResult.Tests/FsToolkit.ErrorHandling.TaskResult.Tests.fsproj b/.../FsToolkit.ErrorHandling.TaskResult.Tests/FsToolkit.ErrorHandling.TaskResult.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp5.0;net472</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>
     <LangVersion>preview</LangVersion>

diff --git a/tests/FsToolkit.ErrorHandling.TaskResult.Tests/paket.references b/tests/FsToolkit.ErrorHandling.TaskResult.Tests/paket.references
@@ -1,2 +1,3 @@
 group Test
-Expecto
+Expecto
+Microsoft.NETFramework.ReferenceAssemblies
diff --git a/tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj b/tests/FsToolkit.ErrorHandling.Tests/FsToolkit.ErrorHandling.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>netcoreapp3.1;netcoreapp5.0</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.1;netcoreapp5.0;net472</TargetFrameworks>
     <LangVersion>preview</LangVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetLatestRuntimePatch>true</TargetLatestRuntimePatch>

diff --git a/tests/FsToolkit.ErrorHandling.Tests/paket.references b/tests/FsToolkit.ErrorHandling.Tests/paket.references
@@ -1,3 +1,4 @@
 group Test
 Expecto
-Fable.Mocha
+Fable.Mocha
+Microsoft.NETFramework.ReferenceAssemblies