Make use of Fable.Package.SDK

nfdi4plants · Oct 2, 2024 · 93030e9 · 93030e9
1 parent 755879d
commit 93030e9
Show file tree

Hide file tree

Showing 37 changed files with 431 additions and 321 deletions.
diff --git a/ARCtrl.sln b/ARCtrl.sln
@@ -29,6 +29,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{6DA2330B-D40
 	ProjectSection(SolutionItems) = preProject
 		src\ARCtrl\ARCtrl.Javascript.fsproj = src\ARCtrl\ARCtrl.Javascript.fsproj
 		src\ARCtrl\ARCtrl.Python.fsproj = src\ARCtrl\ARCtrl.Python.fsproj
+		src\Package.Metadata.props = src\Package.Metadata.props
 	EndProjectSection
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "Build", "build\Build.fsproj", "{5EAFB0CD-1168-4FCA-AA61-E96AD6C85819}"

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,15 +1,4 @@
 <Project>
-
-    <PropertyGroup>
-        <Authors>nfdi4plants, Lukas Weil, Kevin Frey, Kevin Schneider, Florian Wetzels</Authors>
-        <PackageLicenseExpression>MIT</PackageLicenseExpression>
-        <PackageIcon>logo.png</PackageIcon>
-        <PackageTags>ARC F# FSharp dotnet .Net bioinformatics biology fable-library datascience dataplant nfdi metadata</PackageTags>
-        <PackageProjectUrl>https://github.com/nfdi4plants/ARCtrl</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
-        <RepositoryType>git</RepositoryType>
-    </PropertyGroup>
-
     <!-- Make F# support Central Package Management -->
     <PropertyGroup>
         <DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="Fable.Core"            Version="4.3.0" />
-    <PackageVersion Include="Fable.Package.SDK"     Version="1.0.0" />
+    <PackageVersion Include="Fable.Package.SDK"     Version="1.1.0" />
     <PackageVersion Include="FSharp.Core"           Version="[8.0.1,)" />
     <PackageVersion Include="Thoth.Json.Core"       Version="0.4.0" />
     <PackageVersion Include="Thoth.Json.JavaScript" Version="0.3.0" />

diff --git a/src/ARCtrl/ARCtrl.Javascript.fsproj b/src/ARCtrl/ARCtrl.Javascript.fsproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>fable-javascript</PackageTags>
     <DefineConstants>FABLE_COMPILER_JAVASCRIPT;FABLE_COMPILER;FABLE_COMPILER_TYPESCRIPT</DefineConstants>
   </PropertyGroup>
+  <Import Project="../Package.Metadata.props" />
+
   <Import Project="ARCtrl.Common.props" />
   <ItemGroup>
     <Compile Include="WebRequest\WebRequest.Node.fs" />
@@ -20,9 +21,6 @@
     <PackageReference Include="Thoth.Json.Javascript"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
-  </ItemGroup>
   <PropertyGroup>
     <NpmDependencies>
       <NpmPackage Name="isomorphic-fetch" Version="gt 3.0.0 lt 3.0.0" ResolutionStrategy="Max" />

diff --git a/src/ARCtrl/ARCtrl.Python.fsproj b/src/ARCtrl/ARCtrl.Python.fsproj
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>fable-python</PackageTags>
     <DefineConstants>FABLE_COMPILER_PYTHON;FABLE_COMPILER</DefineConstants>
   </PropertyGroup>
+  <Import Project="../Package.Metadata.props" />
+
   <Import Project="ARCtrl.Common.props" />
   <ItemGroup>   
     <Compile Include="WebRequest\WebRequest.Py.fs" />
@@ -14,9 +15,7 @@
     <Compile Include="Json.fs" />
     <Compile Include="Xlsx.fs" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
-  </ItemGroup>
+
   <ItemGroup>
     <PackageReference Include="Thoth.Json.Python"/>
   </ItemGroup>

diff --git a/src/ARCtrl/ARCtrl.fsproj b/src/ARCtrl/ARCtrl.fsproj
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>fable-dotnet</PackageTags>
   </PropertyGroup>
-
+  <Import Project="../Package.Metadata.props" />
+
   <Import Project="ARCtrl.Common.props" />
   <ItemGroup>  
     <None Include="ARCtrl.Common.props" />

diff --git a/src/ARCtrl/packages.lock.json b/src/ARCtrl/packages.lock.json
@@ -2,30 +2,11 @@
   "version": 2,
   "dependencies": {
     ".NETStandard,Version=v2.0": {
-      "Fable.Fetch": {
-        "type": "Direct",
-        "requested": "[2.6.0, )",
-        "resolved": "2.6.0",
-        "contentHash": "zhCl95EYeuKcc7bk2jGHLSuLhkPqvRcrlwC91GqgX51BlQ7WJF2IQ7mUxW2n1mg74M1D2VOwEKqQpTAZDCVa8Q==",
-        "dependencies": {
-          "FSharp.Core": "4.7.2",
-          "Fable.Browser.Blob": "1.2.0",
-          "Fable.Browser.Event": "1.5.0",
-          "Fable.Core": "3.7.1",
-          "Fable.Promise": "2.2.2"
-        }
-      },
-      "Fable.SimpleHttp": {
+      "Fable.Package.SDK": {
         "type": "Direct",
-        "requested": "[3.5.0, )",
-        "resolved": "3.5.0",
-        "contentHash": "SWYshvAI90JcdGLsUmTWBG9eaazY6ihdIk/uehrEz/VqMx9qX+e7+PzYaw31DMwGYSva9/mpq9s69T/z8Ubl5Q==",
-        "dependencies": {
-          "FSharp.Core": "4.6.2",
-          "Fable.Browser.Dom": "1.0.0",
-          "Fable.Browser.XMLHttpRequest": "1.1.0",
-          "Fable.Core": "3.0.0"
-        }
+        "requested": "[1.1.0, )",
+        "resolved": "1.1.0",
+        "contentHash": "YEMSyiB/HCpBgDSZUr0LHaTa9vYH+xj8Fvd/AvzUAVbLQ3Bc2l9xHOI9g4+Bh1wGsLFrhMwFW+U39D7m5a6oOw=="
       },
       "NETStandard.Library": {
         "type": "Direct",
@@ -36,86 +17,26 @@
           "Microsoft.NETCore.Platforms": "1.1.0"
         }
       },
-      "Thoth.Json.JavaScript": {
+      "Thoth.Json.Python": {
         "type": "Direct",
-        "requested": "[0.3.0, )",
-        "resolved": "0.3.0",
-        "contentHash": "A4Cwv+RigC52/OdcrU2woEvjd6rsiDlQGDNTqwXYe3Yh6cdzcLWTfmmwTuCOXgV8SMbcSkviqiS2AG5BS42ayg==",
+        "requested": "[0.4.0, )",
+        "resolved": "0.4.0",
+        "contentHash": "O86Oisv/91NpbHENz11poZh9zrTRJdAjDXHVC1JqvDDsscelI7HxOmWgks8ZFvYxbBzNJCG+FKQHC10KzyMf8g==",
         "dependencies": {
           "FSharp.Core": "5.0.0",
           "Fable.Core": "4.1.0",
           "Fable.Package.SDK": "1.0.0",
+          "Fable.Python": "4.3.0",
           "Thoth.Json.Core": "0.4.0"
         }
       },
-      "Fable.Browser.Blob": {
-        "type": "Transitive",
-        "resolved": "1.2.0",
-        "contentHash": "bM4zbtIeycTFFCH7o4WuN28W70dTxNTMZiMvR70XUTYrBnbz7GpS5XxzUy5caDB4l7s2l7wiuVDhh52t7NXxDg==",
-        "dependencies": {
-          "FSharp.Core": "4.7.2",
-          "Fable.Core": "3.0.0"
-        }
-      },
-      "Fable.Browser.Dom": {
-        "type": "Transitive",
-        "resolved": "1.0.0",
-        "contentHash": "ZodpIKYuKnUnqN71Fi103mh0joFYrRPGwpYOrpbZ149PkVAW7DNKXgxad5lsi9df7vAe5+sBhhO71TPREZaWlw==",
-        "dependencies": {
-          "FSharp.Core": "4.5.2",
-          "Fable.Browser.Blob": "1.0.0",
-          "Fable.Browser.Event": "1.0.0",
-          "Fable.Browser.WebStorage": "1.0.0",
-          "Fable.Core": "3.0.0"
-        }
-      },
-      "Fable.Browser.Event": {
+      "Fable.Python": {
         "type": "Transitive",
-        "resolved": "1.5.0",
-        "contentHash": "Bx2AOOASIG1Eq1Pe8869H8baMePte6STmKGccGuOYMT2p6nWVS8G6ZBZb5encQ0tAL2/0vhA4KJOl4bYwUaQqg==",
-        "dependencies": {
-          "FSharp.Core": "4.7.2",
-          "Fable.Browser.Gamepad": "1.1.0",
-          "Fable.Core": "3.0.0"
-        }
-      },
-      "Fable.Browser.Gamepad": {
-        "type": "Transitive",
-        "resolved": "1.1.0",
-        "contentHash": "8m/Ae/mrH2Hb2ue435rTPEeVb2FhfWsRJJLpCxMvk+5EUOO2+IIjIkLq4thUfRL98uQVt9V5cQd14h2aBf2XJA==",
-        "dependencies": {
-          "FSharp.Core": "4.7.2",
-          "Fable.Core": "3.0.0"
-        }
-      },
-      "Fable.Browser.WebStorage": {
-        "type": "Transitive",
-        "resolved": "1.0.0",
-        "contentHash": "ZqnZKYkhPO+wmJPxQqtiwSc3zCC/mB37SPlVi4ZLiHoPFnra7SQ3qaRn4/ENYTeaVtVq92eVaYbTyAOnFn+GPA==",
-        "dependencies": {
-          "FSharp.Core": "4.5.2",
-          "Fable.Browser.Event": "1.0.0",
-          "Fable.Core": "3.0.0"
-        }
-      },
-      "Fable.Browser.XMLHttpRequest": {
-        "type": "Transitive",
-        "resolved": "1.1.0",
-        "contentHash": "27p/F8781NrnV9vQ23RhX10ww9MDkX+Yi3yTiV9s8U8Bufi/VCCjS4swX0LXvgKQANN3k87CwaNeiO75r2U7gw==",
-        "dependencies": {
-          "FSharp.Core": "4.6.2",
-          "Fable.Browser.Blob": "1.1.0",
-          "Fable.Browser.Event": "1.0.0",
-          "Fable.Core": "3.0.0"
-        }
-      },
-      "Fable.Promise": {
-        "type": "Transitive",
-        "resolved": "2.2.2",
-        "contentHash": "yHFSo7GCY0l/Wjskh/HESuFoGzXIoRM22UlrARA5ewnX736Y1wM27kcqCWeGcIzaEsgJnZcDkp093M0gQyMcWA==",
+        "resolved": "4.3.0",
+        "contentHash": "KT5PI4NyMtVLDcmDkf5SeqwtFjVO17u27xr45qXfYWG12UePHxGjQJoI16OafIzlEQ6cHfAuRljhZGKIlvOJNQ==",
         "dependencies": {
           "FSharp.Core": "4.7.2",
-          "Fable.Core": "3.1.5"
+          "Fable.Core": "[4.1.0, 5.0.0)"
         }
       },
       "Microsoft.NETCore.Platforms": {
@@ -126,62 +47,73 @@
       "arctrl.contract": {
         "type": "Project",
         "dependencies": {
-          "ARCtrl.Core": "[1.0.0, )",
-          "ARCtrl.Json": "[1.0.0, )",
-          "ARCtrl.Spreadsheet": "[1.0.0, )",
-          "ARCtrl.Yaml": "[1.0.0, )"
+          "ARCtrl.Core": "[2.0.1, )",
+          "ARCtrl.Json": "[2.0.1, )",
+          "ARCtrl.Spreadsheet": "[2.0.1, )",
+          "ARCtrl.Yaml": "[2.0.1, )",
+          "Fable.Package.SDK": "[1.1.0, )"
         }
       },
       "arctrl.core": {
         "type": "Project",
         "dependencies": {
-          "ARCtrl.CWL": "[1.0.0, )",
-          "ARCtrl.FileSystem": "[1.0.0, )"
+          "ARCtrl.CWL": "[2.0.1, )",
+          "ARCtrl.FileSystem": "[2.0.1, )",
+          "Fable.Package.SDK": "[1.1.0, )"
         }
       },
       "arctrl.cwl": {
-        "type": "Project"
+        "type": "Project",
+        "dependencies": {
+          "Fable.Package.SDK": "[1.1.0, )"
+        }
       },
       "arctrl.filesystem": {
         "type": "Project",
         "dependencies": {
-          "Fable.Core": "[4.3.0, )"
+          "Fable.Core": "[4.3.0, )",
+          "Fable.Package.SDK": "[1.1.0, )"
         }
       },
       "arctrl.json": {
         "type": "Project",
         "dependencies": {
-          "ARCtrl.Core": "[1.0.0, )",
-          "ARCtrl.ROCrate": "[1.0.0, )",
+          "ARCtrl.Core": "[2.0.1, )",
+          "ARCtrl.ROCrate": "[2.0.1, )",
+          "Fable.Package.SDK": "[1.1.0, )",
           "Thoth.Json.Core": "[0.4.0, )"
         }
       },
       "arctrl.rocrate": {
         "type": "Project",
         "dependencies": {
           "DynamicObj": "[4.0.0, )",
+          "Fable.Package.SDK": "[1.1.0, )",
           "Thoth.Json.Core": "[0.4.0, )"
         }
       },
       "arctrl.spreadsheet": {
         "type": "Project",
         "dependencies": {
-          "ARCtrl.Core": "[1.0.0, )",
-          "ARCtrl.FileSystem": "[1.0.0, )",
+          "ARCtrl.Core": "[2.0.1, )",
+          "ARCtrl.FileSystem": "[2.0.1, )",
+          "Fable.Package.SDK": "[1.1.0, )",
           "FsSpreadsheet": "[6.3.0-alpha.4, )"
         }
       },
       "arctrl.validationpackages": {
         "type": "Project",
         "dependencies": {
-          "ARCtrl.Core": "[1.0.0, )"
+          "ARCtrl.Core": "[2.0.1, )",
+          "Fable.Package.SDK": "[1.1.0, )"
         }
       },
       "arctrl.yaml": {
         "type": "Project",
         "dependencies": {
-          "ARCtrl.Core": "[1.0.0, )",
-          "ARCtrl.ValidationPackages": "[1.0.0, )",
+          "ARCtrl.Core": "[2.0.1, )",
+          "ARCtrl.ValidationPackages": "[2.0.1, )",
+          "Fable.Package.SDK": "[1.1.0, )",
           "YAMLicious": "[0.0.1, )"
         }
       },
@@ -201,12 +133,6 @@
         "resolved": "4.3.0",
         "contentHash": "sbK+hYs7H7I3b3sbgttI4GlvQfNPcIqSz1qPSagF3QbVA46KJ/pWSXC/Dwv0s9M6AeRGmoqcIeD7GUaLn41zkA=="
       },
-      "Fable.Package.SDK": {
-        "type": "CentralTransitive",
-        "requested": "[1.0.0, )",
-        "resolved": "1.0.0",
-        "contentHash": "TIXktcGpeqE3QOr2coV+w5erpLtfijpfBilhb0MNV2OSao/Y5Zg3r7StF+wZ4jSm4Pkid4HpjshZB/V9fUc/Ew=="
-      },
       "FSharp.Core": {
         "type": "CentralTransitive",
         "requested": "[8.0.1, )",

diff --git a/src/CWL/ARCtrl.CWL.fsproj b/src/CWL/ARCtrl.CWL.fsproj
@@ -1,16 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>fable-javascript;fable-python;fable-dotnet</PackageTags>
   </PropertyGroup>
+  <Import Project="../Package.Metadata.props" />
   <ItemGroup> 
     <Compile Include="Library.fs" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
-    <None Include="../../build/logo.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
   <PropertyGroup>
     <Description>ARC helper functions for Common workflow language.</Description>
     <PackageTags>ARC F# FSharp dotnet .Net bioinformatics biology fable-library datascience dataplant nfdi metadata</PackageTags>

diff --git a/src/CWL/packages.lock.json b/src/CWL/packages.lock.json
@@ -2,6 +2,12 @@
   "version": 2,
   "dependencies": {
     ".NETStandard,Version=v2.0": {
+      "Fable.Package.SDK": {
+        "type": "Direct",
+        "requested": "[1.1.0, )",
+        "resolved": "1.1.0",
+        "contentHash": "YEMSyiB/HCpBgDSZUr0LHaTa9vYH+xj8Fvd/AvzUAVbLQ3Bc2l9xHOI9g4+Bh1wGsLFrhMwFW+U39D7m5a6oOw=="
+      },
       "NETStandard.Library": {
         "type": "Direct",
         "requested": "[2.0.3, )",

diff --git a/src/Contract/ARCtrl.Contract.fsproj b/src/Contract/ARCtrl.Contract.fsproj
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    <PackageTags>fable-javascript;fable-python;fable-dotnet</PackageTags>
   </PropertyGroup>
+  <Import Project="../Package.Metadata.props" />
+
   <ItemGroup>
     <None Include="README.md" />
     <Compile Include="Contract.fs" />
@@ -21,10 +22,6 @@
     <ProjectReference Include="..\Yaml\ARCtrl.Yaml.fsproj" />
     <ProjectReference Include="..\Spreadsheet\ARCtrl.Spreadsheet.fsproj" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
-    <None Include="../../build/logo.png" Pack="true" PackagePath="\" />
-  </ItemGroup>
   <PropertyGroup>
     <Description>ARC helper functions for contracts management.</Description>
     <PackageTags>ARC F# FSharp dotnet .Net bioinformatics biology fable-library datascience dataplant nfdi metadata</PackageTags>