remove querymodel from build and update ARCtrl

nfdi4plants · Aug 28, 2024 · 9f0e80c · 9f0e80c
1 parent c6f5250
commit 9f0e80c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 36 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/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="2.0.0-alpha.6" />
-    <PackageReference Include="FsSpreadsheet" Version="6.1.2" />
-    <PackageReference Include="FsSpreadsheet.Net" Version="6.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
@@ -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
Original file line number	Diff line number	Diff line change
Expand Up		@@ -351,3 +351,4 @@ MigrationBackup/

		/TestResults/
		tests/ARCtrl.Querymodel.Tests/playground_2.fsx
		/RELEASE_NOTES.md