use Microsoft.NETFramework.ReferenceAssemblies instead of netfx.props

TheAngryByrd · Dec 21, 2019 · 3e79a4a · 3e79a4a
1 parent f595490
commit 3e79a4a
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 106 deletions.
diff --git a/Content/Console/fsc.props b/Content/Console/fsc.props
diff --git a/Content/Console/netfx.props b/Content/Console/netfx.props
diff --git a/Content/Console/src/MyLib.1/MyLib.1.fsproj b/Content/Console/src/MyLib.1/MyLib.1.fsproj
@@ -20,7 +20,5 @@
     <None Include="App.config" />
     <Compile Include="Main.fs" />
   </ItemGroup>
-  <!-- <Import Project="..\..\fsc.props" /> -->
-  <Import Project="..\..\netfx.props" />
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj b/Content/Console/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj
@@ -12,7 +12,5 @@
     <ItemGroup>
         <ProjectReference Include="../../src/MyLib.1/MyLib.1.fsproj" />
     </ItemGroup>
-    <!-- <Import Project="..\..\fsc.props" /> -->
-    <Import Project="..\..\netfx.props" />
     <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/Content/Library/docsTool/docsTool.fsproj b/Content/Library/docsTool/docsTool.fsproj
@@ -20,7 +20,6 @@
     <Compile Include="Program.fs" />
   </ItemGroup>
 
-  <Import Project="..\netfx.props" />
   <Import Project="..\.paket\Paket.Restore.targets" />
 
 </Project>
diff --git a/Content/Library/fsc.props b/Content/Library/fsc.props
diff --git a/Content/Library/netfx.props b/Content/Library/netfx.props
diff --git a/Content/Library/paket.dependencies b/Content/Library/paket.dependencies
@@ -4,6 +4,7 @@ storage: none
 clitool dotnet-mono 0.5.2
 nuget FSharp.Core 4.3.4
 nuget Microsoft.SourceLink.GitHub prerelease copy_local: true
+nuget Microsoft.NETFramework.ReferenceAssemblies copy_local: true
 nuget Expecto 8.13.1
 nuget YoloDev.Expecto.TestSdk 0.8.0
 nuget Microsoft.NET.Test.Sdk 15.7.2

diff --git a/Content/Library/paket.lock b/Content/Library/paket.lock
@@ -87,6 +87,31 @@ NUGET
       Microsoft.NETCore.DotNetAppHost (>= 3.0.1)
     Microsoft.NETCore.Platforms (3.0) - 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)) (>= netcoreapp2.1)
     Microsoft.NETCore.Targets (3.0) - 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)) (>= netcoreapp2.1)
+    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.0) - copy_local: true
     Microsoft.SourceLink.GitHub (1.0) - copy_local: true
       Microsoft.Build.Tasks.Git (>= 1.0)

diff --git a/Content/Library/src/MyLib.1/MyLib.1.fsproj b/Content/Library/src/MyLib.1/MyLib.1.fsproj
@@ -18,7 +18,5 @@
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="Library.fs" />
   </ItemGroup>
-  <!-- <Import Project="..\..\fsc.props" /> -->
-  <Import Project="..\..\netfx.props" />
   <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/Content/Library/src/MyLib.1/paket.references b/Content/Library/src/MyLib.1/paket.references
@@ -1,2 +1,3 @@
 FSharp.Core
-Microsoft.SourceLink.GitHub
+Microsoft.SourceLink.GitHub
+Microsoft.NETFramework.ReferenceAssemblies
diff --git a/Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj b/Content/Library/tests/MyLib.1.Tests/MyLib.1.Tests.fsproj
@@ -12,7 +12,5 @@
     <ItemGroup>
         <ProjectReference Include="../../src/MyLib.1/MyLib.1.fsproj" />
     </ItemGroup>
-    <!-- <Import Project="..\..\fsc.props" /> -->
-    <Import Project="..\..\netfx.props" />
     <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/Content/Library/tests/MyLib.1.Tests/paket.references b/Content/Library/tests/MyLib.1.Tests/paket.references
@@ -4,3 +4,4 @@ dotnet-mono
 Microsoft.NET.Test.Sdk
 YoloDev.Expecto.TestSdk
 altcover
+Microsoft.NETFramework.ReferenceAssemblies