Merge pull request #69 from Thecentury/downgrade-to-netstandard-2.0

Downgraded the Myriad to netstandard 2.0
MoiraeSoftware · Aug 18, 2020 · 61f0af5 · 61f0af5
2 parents 689464f + 2b23f22
commit 61f0af5
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 27 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -17,7 +17,7 @@
             "preLaunchTask": "build",
             "program": "${workspaceFolder}/src/myriad/bin/Debug/netcoreapp3.0/myriad.dll",
             "args": [
-                "--plugin", "${workspaceFolder}/src/Myriad.Plugins/bin/Debug/netstandard2.1/Myriad.Plugins.dll",
+                "--plugin", "${workspaceFolder}/src/Myriad.Plugins/bin/Debug/netstandard2.0/Myriad.Plugins.dll",
                 "--inputfile", "${workspaceFolder}/samples/Example/Library.fs",
                 "--outputfile",  "${workspaceFolder}/samples/Example/Verify.fs",
                 "--namespace", "Test"

diff --git a/paket.dependencies b/paket.dependencies
@@ -1,5 +1,5 @@
 source https://api.nuget.org/v3/index.json
-framework: netcoreapp3.0, netstandard2.1
+framework: netcoreapp3.0, netstandard2.0
 storage: none
 
 nuget Argu

diff --git a/paket.lock b/paket.lock
@@ -1,5 +1,5 @@
 STORAGE: NONE
-RESTRICTION: || (== netcoreapp3.0) (== netstandard2.1)
+RESTRICTION: || (== netcoreapp3.0) (== netstandard2.0)
 NUGET
   remote: https://api.nuget.org/v3/index.json
     Argu (6.1.1)
@@ -31,36 +31,38 @@ NUGET
     Microsoft.SourceLink.GitHub (1.0)
       Microsoft.Build.Tasks.Git (>= 1.0)
       Microsoft.SourceLink.Common (>= 1.0)
-    Microsoft.Win32.SystemEvents (4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.1) (>= netcoreapp3.0))
-      Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.1) (>= netcoreapp2.0))
+    Microsoft.Win32.SystemEvents (4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
+      Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.0) (>= netcoreapp2.0))
     Mono.Cecil (0.11.2)
     System.Buffers (4.5.1)
     System.Collections.Immutable (1.7.1)
-      System.Memory (>= 4.5.4) - restriction: || (&& (== netcoreapp3.0) (>= net461)) (&& (== netcoreapp3.0) (< netcoreapp2.1)) (&& (== netcoreapp3.0) (< netstandard2.0)) (&& (== netcoreapp3.0) (>= uap10.1)) (== netstandard2.1)
+      System.Memory (>= 4.5.4) - restriction: || (&& (== netcoreapp3.0) (>= net461)) (&& (== netcoreapp3.0) (< netcoreapp2.1)) (&& (== netcoreapp3.0) (< netstandard2.0)) (&& (== netcoreapp3.0) (>= uap10.1)) (== netstandard2.0)
     System.Configuration.ConfigurationManager (4.7)
       System.Security.Cryptography.ProtectedData (>= 4.7)
       System.Security.Permissions (>= 4.7)
-    System.Drawing.Common (4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.1) (>= netcoreapp3.0))
-      Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.1) (>= netcoreapp2.0))
-      Microsoft.Win32.SystemEvents (>= 4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.1) (>= netcoreapp2.0))
+    System.Drawing.Common (4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
+      Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.0) (>= netcoreapp2.0))
+      Microsoft.Win32.SystemEvents (>= 4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.0) (>= netcoreapp2.0))
     System.IO (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
       System.Text.Encoding (>= 4.3)
       System.Threading.Tasks (>= 4.3)
     System.Memory (4.5.4)
-      System.Buffers (>= 4.5.1) - restriction: || (&& (== netcoreapp3.0) (>= monoandroid)) (&& (== netcoreapp3.0) (>= monotouch)) (&& (== netcoreapp3.0) (>= net461)) (&& (== netcoreapp3.0) (< netcoreapp2.0)) (&& (== netcoreapp3.0) (< netstandard1.1)) (&& (== netcoreapp3.0) (< netstandard2.0)) (&& (== netcoreapp3.0) (>= xamarinios)) (&& (== netcoreapp3.0) (>= xamarinmac)) (&& (== netcoreapp3.0) (>= xamarintvos)) (&& (== netcoreapp3.0) (>= xamarinwatchos)) (== netstandard2.1)
-      System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== netcoreapp3.0) (< netcoreapp2.0)) (== netstandard2.1)
-      System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== netcoreapp3.0) (>= monoandroid)) (&& (== netcoreapp3.0) (>= monotouch)) (&& (== netcoreapp3.0) (>= net461)) (&& (== netcoreapp3.0) (< netcoreapp2.0)) (&& (== netcoreapp3.0) (< netcoreapp2.1)) (&& (== netcoreapp3.0) (< netstandard1.1)) (&& (== netcoreapp3.0) (< netstandard2.0)) (&& (== netcoreapp3.0) (>= uap10.1)) (&& (== netcoreapp3.0) (>= xamarinios)) (&& (== netcoreapp3.0) (>= xamarinmac)) (&& (== netcoreapp3.0) (>= xamarintvos)) (&& (== netcoreapp3.0) (>= xamarinwatchos)) (== netstandard2.1)
-    System.Numerics.Vectors (4.5) - restriction: || (&& (== netcoreapp3.0) (< netcoreapp2.0)) (== netstandard2.1)
+      System.Buffers (>= 4.5.1) - restriction: || (&& (== netcoreapp3.0) (>= monotouch)) (&& (== netcoreapp3.0) (>= net461)) (&& (== netcoreapp3.0) (< netcoreapp2.0)) (&& (== netcoreapp3.0) (< netstandard1.1)) (&& (== netcoreapp3.0) (< netstandard2.0)) (&& (== netcoreapp3.0) (>= xamarinios)) (&& (== netcoreapp3.0) (>= xamarinmac)) (&& (== netcoreapp3.0) (>= xamarintvos)) (&& (== netcoreapp3.0) (>= xamarinwatchos)) (== netstandard2.0)
+      System.Numerics.Vectors (>= 4.4) - restriction: || (&& (== netcoreapp3.0) (< netcoreapp2.0)) (== netstandard2.0)
+      System.Runtime.CompilerServices.Unsafe (>= 4.5.3) - restriction: || (&& (== netcoreapp3.0) (>= monotouch)) (&& (== netcoreapp3.0) (>= net461)) (&& (== netcoreapp3.0) (< netcoreapp2.0)) (&& (== netcoreapp3.0) (< netcoreapp2.1)) (&& (== netcoreapp3.0) (< netstandard1.1)) (&& (== netcoreapp3.0) (< netstandard2.0)) (&& (== netcoreapp3.0) (>= uap10.1)) (&& (== netcoreapp3.0) (>= xamarinios)) (&& (== netcoreapp3.0) (>= xamarinmac)) (&& (== netcoreapp3.0) (>= xamarintvos)) (&& (== netcoreapp3.0) (>= xamarinwatchos)) (== netstandard2.0)
+    System.Numerics.Vectors (4.5) - restriction: || (&& (== netcoreapp3.0) (< netcoreapp2.0)) (== netstandard2.0)
     System.Reflection (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.IO (>= 4.3)
       System.Reflection.Primitives (>= 4.3)
       System.Runtime (>= 4.3)
     System.Reflection.Emit (4.7)
+      System.Reflection.Emit.ILGeneration (>= 4.7) - restriction: || (&& (== netcoreapp3.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== netcoreapp3.0) (< netstandard1.1)) (&& (== netcoreapp3.0) (< netstandard2.0)) (&& (== netcoreapp3.0) (>= uap10.1)) (== netstandard2.0)
+    System.Reflection.Emit.ILGeneration (4.7) - restriction: || (&& (== netcoreapp3.0) (< netcoreapp2.0) (< netstandard2.1)) (&& (== netcoreapp3.0) (< netstandard1.1)) (&& (== netcoreapp3.0) (< netstandard2.0)) (&& (== netcoreapp3.0) (>= uap10.1)) (== netstandard2.0)
     System.Reflection.Metadata (1.8.1)
       System.Collections.Immutable (>= 1.7.1)
     System.Reflection.Primitives (4.3)
@@ -71,19 +73,19 @@ NUGET
     System.Runtime (4.3.1)
       Microsoft.NETCore.Platforms (>= 1.1.1)
       Microsoft.NETCore.Targets (>= 1.1.3)
-    System.Runtime.CompilerServices.Unsafe (4.7.1) - restriction: || (&& (== netcoreapp3.0) (>= monoandroid)) (&& (== netcoreapp3.0) (>= monotouch)) (&& (== netcoreapp3.0) (>= net461)) (&& (== netcoreapp3.0) (< netcoreapp2.0)) (&& (== netcoreapp3.0) (< netcoreapp2.1)) (&& (== netcoreapp3.0) (< netstandard1.1)) (&& (== netcoreapp3.0) (< netstandard2.0)) (&& (== netcoreapp3.0) (>= uap10.1)) (&& (== netcoreapp3.0) (>= xamarinios)) (&& (== netcoreapp3.0) (>= xamarinmac)) (&& (== netcoreapp3.0) (>= xamarintvos)) (&& (== netcoreapp3.0) (>= xamarinwatchos)) (== netstandard2.1)
+    System.Runtime.CompilerServices.Unsafe (4.7.1) - restriction: || (&& (== netcoreapp3.0) (>= monotouch)) (&& (== netcoreapp3.0) (>= net461)) (&& (== netcoreapp3.0) (< netcoreapp2.0)) (&& (== netcoreapp3.0) (< netcoreapp2.1)) (&& (== netcoreapp3.0) (< netstandard1.1)) (&& (== netcoreapp3.0) (< netstandard2.0)) (&& (== netcoreapp3.0) (>= uap10.1)) (&& (== netcoreapp3.0) (>= xamarinios)) (&& (== netcoreapp3.0) (>= xamarinmac)) (&& (== netcoreapp3.0) (>= xamarintvos)) (&& (== netcoreapp3.0) (>= xamarinwatchos)) (== netstandard2.0)
     System.Runtime.Loader (4.3)
       System.IO (>= 4.3)
       System.Reflection (>= 4.3)
       System.Runtime (>= 4.3)
     System.Security.AccessControl (4.7)
-      Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.1) (>= netcoreapp2.0))
+      Microsoft.NETCore.Platforms (>= 3.1) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.0) (>= netcoreapp2.0))
       System.Security.Principal.Windows (>= 4.7)
     System.Security.Cryptography.ProtectedData (4.7)
-      System.Memory (>= 4.5.3) - restriction: || (&& (== netcoreapp3.0) (< netcoreapp2.1)) (== netstandard2.1)
+      System.Memory (>= 4.5.3) - restriction: || (&& (== netcoreapp3.0) (< netcoreapp2.1)) (== netstandard2.0)
     System.Security.Permissions (4.7)
       System.Security.AccessControl (>= 4.7)
-      System.Windows.Extensions (>= 4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.1) (>= netcoreapp3.0))
+      System.Windows.Extensions (>= 4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
     System.Security.Principal.Windows (4.7)
     System.Text.Encoding (4.3)
       Microsoft.NETCore.Platforms (>= 1.1)
@@ -93,8 +95,8 @@ NUGET
       Microsoft.NETCore.Platforms (>= 1.1)
       Microsoft.NETCore.Targets (>= 1.1)
       System.Runtime (>= 4.3)
-    System.Windows.Extensions (4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.1) (>= netcoreapp3.0))
-      System.Drawing.Common (>= 4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.1) (>= netcoreapp3.0))
+    System.Windows.Extensions (4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
+      System.Drawing.Common (>= 4.7) - restriction: || (== netcoreapp3.0) (&& (== netstandard2.0) (>= netcoreapp3.0))
 
 GROUP Build
 STORAGE: NONE

diff --git a/src/Myriad.Core/Myriad.Core.fsproj b/src/Myriad.Core/Myriad.Core.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Core Myriad library used for developing plugins</Description>
     <DebugType>embedded</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/Myriad.Plugins/Myriad.Plugins.fsproj b/src/Myriad.Plugins/Myriad.Plugins.fsproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <Description>Set of built-in Myriad plugins</Description>
     <DebugType>embedded</DebugType>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

diff --git a/src/Myriad.Plugins/build/Myriad.Plugins.InTest.props b/src/Myriad.Plugins/build/Myriad.Plugins.InTest.props
@@ -1,5 +1,5 @@
 <Project>
     <ItemGroup>
-        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/netstandard2.1/Myriad.Plugins.dll" />
+        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/netstandard2.0/Myriad.Plugins.dll" />
     </ItemGroup>
 </Project>
diff --git a/src/Myriad.Plugins/build/Myriad.Plugins.props b/src/Myriad.Plugins/build/Myriad.Plugins.props
@@ -1,5 +1,5 @@
 <Project>
     <ItemGroup>
-        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/netstandard2.1/Myriad.Plugins.dll" />
+        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/netstandard2.0/Myriad.Plugins.dll" />
     </ItemGroup>
 </Project>
diff --git a/src/Myriad.Sdk/Myriad.Sdk.proj b/src/Myriad.Sdk/Myriad.Sdk.proj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <PackProjectInputFile>$(MSBuildProjectFullPath)</PackProjectInputFile>

diff --git a/test/Myriad.Plugins.Example1/Myriad.Plugins.Example1.fsproj b/test/Myriad.Plugins.Example1/Myriad.Plugins.Example1.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.1</TargetFramework>
+    <TargetFramework>netstandard2.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

diff --git a/test/Myriad.Plugins.Example1/build/Myriad.Plugins.Example1.InTest.props b/test/Myriad.Plugins.Example1/build/Myriad.Plugins.Example1.InTest.props
@@ -1,5 +1,5 @@
 <Project>
     <ItemGroup>
-        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/netstandard2.1/Myriad.Plugins.Example1.dll" />
+        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../bin/$(Configuration)/netstandard2.0/Myriad.Plugins.Example1.dll" />
     </ItemGroup>
 </Project>
diff --git a/test/Myriad.Plugins.Example1/build/Myriad.Plugins.Example1.props b/test/Myriad.Plugins.Example1/build/Myriad.Plugins.Example1.props
@@ -1,5 +1,5 @@
 <Project>
     <ItemGroup>
-        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/netstandard2.1/Myriad.Plugins.Example1.dll" />
+        <MyriadSdkGenerator Include="$(MSBuildThisFileDirectory)/../lib/netstandard2.0/Myriad.Plugins.Example1.dll" />
     </ItemGroup>
 </Project>