Merge pull request #20 from nfdi4plants/updateDependencies2.0.0

Update dependencies2.0.0
nfdi4plants · Aug 28, 2024 · c205ff9 · c205ff9
2 parents bc26f3d + 9f0e80c
commit c205ff9
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -351,3 +351,4 @@ MigrationBackup/
 
 **/TestResults/**
 tests/ARCtrl.Querymodel.Tests/playground_2.fsx
+/RELEASE_NOTES.md
diff --git a/ARCtrl.NET.sln b/ARCtrl.NET.sln
@@ -19,10 +19,6 @@ Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.NET", "src\ARCtrl.NE
 EndProject
 Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.NET.Tests", "tests\ARCtrl.NET.Tests\ARCtrl.NET.Tests.fsproj", "{74227D27-9ED9-45CC-BF80-1569C80719F7}"
 EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.QueryModel", "src\ARCtrl.QueryModel\ARCtrl.QueryModel.fsproj", "{9CCCC686-8294-4A5C-AC93-B605821544A0}"
-EndProject
-Project("{6EC3EE1D-3C4E-46DD-8F32-0CC8E7565705}") = "ARCtrl.Querymodel.Tests", "tests\ARCtrl.Querymodel.Tests\ARCtrl.Querymodel.Tests.fsproj", "{E29980A9-1467-4FDE-90F8-3E3055C12182}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -69,30 +65,6 @@ Global
 		{74227D27-9ED9-45CC-BF80-1569C80719F7}.Release|x64.Build.0 = Release|Any CPU
 		{74227D27-9ED9-45CC-BF80-1569C80719F7}.Release|x86.ActiveCfg = Release|Any CPU
 		{74227D27-9ED9-45CC-BF80-1569C80719F7}.Release|x86.Build.0 = Release|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Debug|x64.Build.0 = Debug|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Debug|x86.Build.0 = Debug|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Release|x64.ActiveCfg = Release|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Release|x64.Build.0 = Release|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Release|x86.ActiveCfg = Release|Any CPU
-		{9CCCC686-8294-4A5C-AC93-B605821544A0}.Release|x86.Build.0 = Release|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Debug|x64.Build.0 = Debug|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Debug|x86.Build.0 = Debug|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Release|x64.ActiveCfg = Release|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Release|x64.Build.0 = Release|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Release|x86.ActiveCfg = Release|Any CPU
-		{E29980A9-1467-4FDE-90F8-3E3055C12182}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,3 +1,7 @@
+### 2.0.0+075458b (Released 2024-4-22)
+* Additions:
+    * [[#075458b](https://github.com/nfdi4plants/ARCtrl.NET/commit/075458b84a50b745ce1dc572a1d35897e1b90d6b)] update dependencies of ARCtrl.NET
+
 ### 1.0.5+2195d8a (Released 2024-2-21)
 * Additions:
     * [[#2c40682](https://github.com/nfdi4plants/ARCtrl.NET/commit/2c406826a109f14b033f12467c6248d963878820)] add querymodel helper function and minimal README

diff --git a/build/ProjectInfo.fs b/build/ProjectInfo.fs
@@ -7,7 +7,7 @@ let project = "ARCtrl.NET"
 let testProjects = 
     [
         "tests/ARCtrl.NET.Tests/ARCtrl.NET.Tests.fsproj"
-        "tests/ARCtrl.Querymodel.Tests/ARCtrl.Querymodel.Tests.fsproj"
+        //"tests/ARCtrl.Querymodel.Tests/ARCtrl.Querymodel.Tests.fsproj"
     ]
 
 let solutionFile  = $"{project}.sln"

diff --git a/src/ARCtrl.NET/ARCtrl.NET.fsproj b/src/ARCtrl.NET/ARCtrl.NET.fsproj
@@ -21,13 +21,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Update="FSharp.Core" Version="7.0.401" />
-  </ItemGroup>
-
+    <PackageReference Update="FSharp.Core" Version="8.0.400" />
+  </ItemGroup> 
+  
   <ItemGroup>
-    <PackageReference Include="ARCtrl" Version="1.0.7" />
-    <PackageReference Include="FsSpreadsheet" Version="5.1.2" />
-    <PackageReference Include="FsSpreadsheet.ExcelIO" Version="5.1.2" />
+    <PackageReference Include="ARCtrl" Version="2.0.0" />
+    <PackageReference Include="FsSpreadsheet" Version="6.2.0" />
+    <PackageReference Include="FsSpreadsheet.Net" Version="6.2.0" />
     <PackageReference Include="JsonDSL" Version="0.0.5" />
     <PackageReference Include="LitXml" Version="0.1.0" />
     <PackageReference Include="NLog" Version="5.1.2" />

diff --git a/src/ARCtrl.NET/Assay.fs b/src/ARCtrl.NET/Assay.fs
@@ -1,10 +1,10 @@
 namespace ARCtrl.NET
 
 open ARCtrl
-open ARCtrl.ISA
-open ARCtrl.ISA.Spreadsheet
+open ARCtrl
+open ARCtrl.Spreadsheet
 open FsSpreadsheet
-open FsSpreadsheet.ExcelIO
+open FsSpreadsheet.Net
 open System.IO 
 
 module Assay = 
@@ -16,7 +16,7 @@ module Assay =
         /// Checks if an assay folder exists in the ARC.
         let exists (arc : string) (identifier : string) =
 
-            Path.Combine([|arc;ARCtrl.Path.AssaysFolderName;identifier|])
+            Path.Combine([|arc;ARCtrl.ArcPathHelper.AssaysFolderName;identifier|])
             |> System.IO.Directory.Exists
 
 
@@ -27,7 +27,7 @@ module Assay =
 
 
     let readByIdentifier (arc : string) (identifier : string) =
-        ISA.Identifier.Assay.fileNameFromIdentifier identifier
+        Helper.Identifier.Assay.fileNameFromIdentifier identifier
         |> readByFileName arc
 
     //let tryReadFromFolder (folderPath : string) =

diff --git a/src/ARCtrl.NET/Contract.fs b/src/ARCtrl.NET/Contract.fs
@@ -2,7 +2,7 @@
 
 open ARCtrl.Contract
 open FsSpreadsheet
-open FsSpreadsheet.ExcelIO
+open FsSpreadsheet.Net
 
 let fulfillReadContract basePath (c : Contract) =
     let log = Logging.createLogger("ReadContractHandler")
@@ -27,7 +27,7 @@ let fulfillWriteContract basePath (c : Contract) =
     | Some (DTO.Spreadsheet wb) ->
         let path = System.IO.Path.Combine(basePath, c.Path)
         Path.ensureDirectory path
-        FsWorkbook.toFile path (wb :?> FsWorkbook)
+        FsWorkbook.toXlsxFile path (wb :?> FsWorkbook)
     | Some (DTO.Text t) ->
         let path = System.IO.Path.Combine(basePath, c.Path)
         Path.ensureDirectory path

diff --git a/tests/ARCtrl.NET.Tests/Arc.fs b/tests/ARCtrl.NET.Tests/Arc.fs
@@ -4,7 +4,6 @@ open Expecto
 open ARCtrl.NET
 open System.IO
 open ARCtrl
-open ARCtrl.ISA
 
 let testInputFolder = System.IO.Path.Combine(__SOURCE_DIRECTORY__,@"TestObjects")
 let testOutputFolder = System.IO.Path.Combine(__SOURCE_DIRECTORY__,@"TestResults")

diff --git a/tests/ARCtrl.NET.Tests/Contract.fs b/tests/ARCtrl.NET.Tests/Contract.fs
@@ -5,7 +5,7 @@ open ARCtrl.Contract
 open Expecto
 open System.IO
 open FsSpreadsheet
-open FsSpreadsheet.ExcelIO
+open FsSpreadsheet.Net
 
 let testInputFolder = System.IO.Path.Combine(__SOURCE_DIRECTORY__,@"TestObjects/Contracts")
 let testOutputFolder = System.IO.Path.Combine(__SOURCE_DIRECTORY__,@"TestResults/Contracts")