From 9f0e80c6b0969f6bba57cd492e8bdf1ccece628e Mon Sep 17 00:00:00 2001 From: HLWeil Date: Wed, 28 Aug 2024 16:51:41 +0200 Subject: [PATCH] remove querymodel from build and update ARCtrl --- .gitignore | 1 + ARCtrl.NET.sln | 28 ---------------------------- build/ProjectInfo.fs | 2 +- src/ARCtrl.NET/ARCtrl.NET.fsproj | 12 ++++++------ src/ARCtrl.NET/Assay.fs | 2 +- 5 files changed, 9 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index c7d2a30..01f2223 100644 --- 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 index 653039c..88643f0 100644 --- 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 index b3b1209..6344999 100644 --- 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 index 4de2f8c..466d0d8 100644 --- a/src/ARCtrl.NET/ARCtrl.NET.fsproj +++ b/src/ARCtrl.NET/ARCtrl.NET.fsproj @@ -21,13 +21,13 @@ - - - + + + - - - + + + diff --git a/src/ARCtrl.NET/Assay.fs b/src/ARCtrl.NET/Assay.fs index 01c57d9..6b293f1 100644 --- 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