nfdi4plants · Freymaurer · Aug 4, 2023 · Aug 4, 2023 · Aug 4, 2023 · Aug 4, 2023
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -7,6 +7,12 @@
       "commands": [
         "fable"
       ]
+    },
+    "paket": {
+      "version": "7.2.1",
+      "commands": [
+        "paket"
+      ]
     }
   }
 }
diff --git a/.gitignore b/.gitignore
@@ -349,9 +349,11 @@ MigrationBackup/
 # Ionide (cross platform F# VS Code tools) working folder
 .ionide/
 
+#Paket dependency manager
+paket-files/
 
 # Custom ignored files
-pkg/
+dist/
 tmp/
 /tests/FileSystem/FileSystem.Tests/js
 /tests/ISA/ISA.Json.Tests/js
@@ -361,3 +363,4 @@ tmp/
 /tests/Python/ARCtrl
 /tests/ARCtrl/js
 /tests/FileSystem/js
+
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/ARCtrl.sln b/ARCtrl.sln
@@ -12,6 +12,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.config\dotnet-tools.json = .config\dotnet-tools.json
 		global.json = global.json
 		package.json = package.json
+		paket.dependencies = paket.dependencies
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md
 	EndProjectSection
@@ -97,10 +98,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.ISA.Spreadsheet", "s
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ISA.Spreadsheet.Tests", "tests\ISA\ISA.Spreadsheet.Tests\ISA.Spreadsheet.Tests.fsproj", "{656E8DAF-EFCF-472E-91D0-987D09B74523}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FileSystem", "FileSystem", "{E36B41EF-DD2A-45EB-912C-E637BBDBFDDE}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FileSystem.Tests", "tests\FileSystem\FileSystem.Tests\FileSystem.Tests.fsproj", "{D7397A55-93AE-4165-9E2D-D83A52C22D41}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "playground", "playground", "{45E972BE-0BFA-4DE3-B84A-D9F13C4E9D08}"
 	ProjectSection(SolutionItems) = preProject
 		playground\KevinF.fsx = playground\KevinF.fsx
@@ -118,6 +115,8 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Tests", "tests\ARCtr
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Contract", "src\Contract\ARCtrl.Contract.fsproj", "{1945EE8A-F105-43A9-91C9-8C4422B9873E}"
 EndProject
+Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "FileSystem.Tests", "tests\FileSystem\FileSystem.Tests.fsproj", "{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -160,10 +159,6 @@ Global
 		{656E8DAF-EFCF-472E-91D0-987D09B74523}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{656E8DAF-EFCF-472E-91D0-987D09B74523}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{656E8DAF-EFCF-472E-91D0-987D09B74523}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7397A55-93AE-4165-9E2D-D83A52C22D41}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7397A55-93AE-4165-9E2D-D83A52C22D41}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7397A55-93AE-4165-9E2D-D83A52C22D41}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7397A55-93AE-4165-9E2D-D83A52C22D41}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9BE5D83D-EA90-4382-A132-174FD158227F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{9BE5D83D-EA90-4382-A132-174FD158227F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{9BE5D83D-EA90-4382-A132-174FD158227F}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -176,6 +171,10 @@ Global
 		{1945EE8A-F105-43A9-91C9-8C4422B9873E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1945EE8A-F105-43A9-91C9-8C4422B9873E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1945EE8A-F105-43A9-91C9-8C4422B9873E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -197,12 +196,11 @@ Global
 		{04789F17-3DC2-4A09-848D-376E5D269740} = {D1BBD7AE-35C8-498F-BABA-C93FFAE68037}
 		{07C7942E-FC34-4C27-82C1-6B2972654BA7} = {C61B3F43-2255-4585-9110-F8AB74F02654}
 		{656E8DAF-EFCF-472E-91D0-987D09B74523} = {D1BBD7AE-35C8-498F-BABA-C93FFAE68037}
-		{E36B41EF-DD2A-45EB-912C-E637BBDBFDDE} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
-		{D7397A55-93AE-4165-9E2D-D83A52C22D41} = {E36B41EF-DD2A-45EB-912C-E637BBDBFDDE}
 		{913222CA-261F-49CB-A823-CC7C335F964A} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
 		{9BE5D83D-EA90-4382-A132-174FD158227F} = {6DA2330B-D407-4FB1-AF05-B0184034EC44}
 		{801247D5-7EE5-49C8-AB26-F822A415BA49} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
 		{1945EE8A-F105-43A9-91C9-8C4422B9873E} = {6DA2330B-D407-4FB1-AF05-B0184034EC44}
+		{D9FE196B-AC21-4C3E-B9AE-DDDEC2158BC3} = {64B34A6E-318D-4E6E-9262-CE52C9B85A38}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1E354DE6-99BA-421E-9EF8-E808B855A85F}

diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# ARCtrl
+# ARCtrl
 Top level ARC DataModel and API function descriptions.
 
 - [ARCtrl](#arctrl)
@@ -14,7 +14,7 @@ Top level ARC DataModel and API function descriptions.
 
 [ISA README.md](src/ISA/README.md) :books:
 
-[Contracts README.md](src/ArcContract/README.md) :books:
+[Contracts README.md](src/Contract/README.md) :books:
 
 # Jargon/Nomenclature
 
@@ -265,3 +265,13 @@ export class Study extends Record implements IEquatable<Study>, IComparable<Stud
         return new Study(Identifier, Assays);
     }
 ```
+
+## Development
+
+### Setup
+
+1. `dotnet tool restore`
+2. `dotnet paket install`
+3. `npm install`
+
+Verify correct setup with `./build.cmd runtests` ✨
diff --git a/build.cmd b/build.cmd
@@ -1,3 +1,5 @@
 @echo off
+
+dotnet paket restore
 cls 
 dotnet run --project ./build/build.fsproj %*
diff --git a/build.sh b/build.sh
@@ -3,4 +3,6 @@
 set -eu
 set -o pipefail
 
+dotnet paket restore
+
 dotnet run --project ./build/Build.fsproj "$@"
diff --git a/build/BasicTasks.fs b/build/BasicTasks.fs
@@ -20,7 +20,7 @@ let clean = BuildTask.create "Clean" [] {
     ++ "src/**/obj"
     ++ "tests/**/bin"
     ++ "tests/**/obj"
-    ++ "pkg"
+    ++ ProjectInfo.pkgDir
     |> Shell.cleanDirs 
 }
 

diff --git a/build/Build.fsproj b/build/Build.fsproj
@@ -1,11 +1,11 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
-
   <ItemGroup>
+    <None Include="paket.references" />
     <Compile Include="Helpers.fs" />
     <Compile Include="MessagePrompts.fs" />
     <Compile Include="ProjectInfo.fs" />
@@ -16,7 +16,6 @@
     <Compile Include="ReleaseTasks.fs" />
     <Compile Include="Build.fs" />
   </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="BlackFox.Fake.BuildTask" Version="0.1.3" />
     <PackageReference Include="Fake.Api.Github" Version="5.23.0-alpha002" />
@@ -27,7 +26,7 @@
     <PackageReference Include="Fake.DotNet.MSBuild" Version="5.23.0-alpha002" />
     <PackageReference Include="Fake.IO.FileSystem" Version="5.23.0-alpha002" />
     <PackageReference Include="Fake.Tools.Git" Version="5.23.0-alpha002" />
-	<PackageReference Include="Fake.Extensions.Release" Version="0.3.0" />
+    <PackageReference Include="Fake.Extensions.Release" Version="0.3.0" />
   </ItemGroup>
-
-</Project>
+  <Import Project="..\.paket\Paket.Restore.targets" />
+</Project>
diff --git a/build/ProjectInfo.fs b/build/ProjectInfo.fs
@@ -9,7 +9,7 @@ let testProjects =
         "tests/ISA/ISA.Tests"
         "tests/ISA/ISA.Json.Tests"
         "tests/ISA/ISA.Spreadsheet.Tests"
-        "tests/FileSystem/FileSystem.Tests"
+        "tests/FileSystem"
     ]
 
 let solutionFile  = $"{project}.sln"
@@ -22,7 +22,7 @@ let gitHome = $"https://github.com/{gitOwner}"
 
 let projectRepo = $"https://github.com/{gitOwner}/{project}"
 
-let pkgDir = "pkg"
+let pkgDir = "dist/pkg"
 
 // Create RELEASE_NOTES.md if not existing. Or "release" would throw an error.
 Fake.Extensions.Release.ReleaseNotes.ensure()

diff --git a/build/TestTasks.fs b/build/TestTasks.fs
@@ -114,7 +114,7 @@ module RunTests =
         run npm "run testJson" ""
         run npm "run testSpreadsheet" ""
         run npm "run testFS" ""
-        run npm "run testJavaScript" ""
+        run npm "run testjs" ""
     }
 
     let runTestsDotnet = BuildTask.create "runTestsDotnet" [clean; build] {

diff --git a/build/paket.references b/build/paket.references
@@ -0,0 +1 @@
+FSharp.Core
diff --git a/js/ARCtrl.js b/js/ARCtrl.js
diff --git a/js/ARCtrl_Lukas_03.08.23.zip b/js/ARCtrl_Lukas_03.08.23.zip