Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update dependencies2.0.0 #20

Merged
merged 3 commits into from
Aug 28, 2024
Merged

Update dependencies2.0.0 #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
075458b
update dependencies of ARCtrl.NET
HLWeil Apr 22, 2024
c6f5250
update dependencies and bump to 2.0.0-alpha2
HLWeil Jun 11, 2024
9f0e80c
remove querymodel from build and update ARCtrl
HLWeil Aug 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
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
28 changes: 0 additions & 28 deletions ARCtrl.NET.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/ProjectInfo.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 6 additions & 6 deletions src/ARCtrl.NET/ARCtrl.NET.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
10 changes: 5 additions & 5 deletions src/ARCtrl.NET/Assay.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =
Expand All @@ -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


Expand All @@ -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) =
Expand Down
4 changes: 2 additions & 2 deletions src/ARCtrl.NET/Contract.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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
Expand Down
1 change: 0 additions & 1 deletion tests/ARCtrl.NET.Tests/Arc.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
2 changes: 1 addition & 1 deletion tests/ARCtrl.NET.Tests/Contract.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading