update dependencies of ARCtrl.NET

nfdi4plants · Apr 22, 2024 · 075458b · 075458b
1 parent 61ed96f
commit 075458b
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/src/ARCtrl.NET/ARCtrl.NET.fsproj b/src/ARCtrl.NET/ARCtrl.NET.fsproj
@@ -25,9 +25,9 @@
   </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-alpha.2" />
+    <PackageReference Include="FsSpreadsheet" Version="6.1.2" />
+    <PackageReference Include="FsSpreadsheet.Net" Version="6.1.2" />
     <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 = 
@@ -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")