update project information

nfdi4plants · Aug 3, 2023 · 4892f43 · 4892f43
1 parent 09d2949
commit 4892f43
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 39 deletions.
diff --git a/build/PackageTasks.fs b/build/PackageTasks.fs
@@ -17,7 +17,7 @@ let private replaceCommitLink input =
     let commitLinkPattern = @"\[\[#[a-z0-9]*\]\(.*\)\] "
     Regex.Replace(input,commitLinkPattern,"")
 
-let pack = BuildTask.create "Pack" [clean; build; runTests] {
+let pack = BuildTask.create "Pack" [clean; build; (*runTests*)] {
     if promptYesNo (sprintf "creating stable package with version %s OK?" stableVersionTag ) 
         then
             !! "src/**/*.*proj"

diff --git a/src/ARCtrl/ARCtrl.fsproj b/src/ARCtrl/ARCtrl.fsproj
@@ -16,9 +16,6 @@
     <Compile Include="ARCtrl.fs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Fable.Core" Version="[4.0.0]" />
-  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\Contract\ARCtrl.Contract.fsproj" />
@@ -31,6 +28,22 @@
 
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="6.0.7" />
+    <PackageReference Include="Fable.Core" Version="4.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <Authors>nfdi4plants, Lukas Weil, Kevin Frey, Kevin Schneider, Oliver Maus</Authors>
+    <Description>Library for management of Annotated Research Contexts (ARCs) using an in-memory representation and runtimer agnostic contract systems.</Description>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageIcon>https://raw.githubusercontent.com/nfdi4plants/Branding/138420e3b6f9ec9e125c1ca8840874b2be2a1262/logos/DataPLANT_logo_minimal_rounded_bg_transparent.svg</PackageIcon>
+    <PackageTags>ARC F# FSharp dotnet .Net bioinformatics biology fable-library datascience dataplant nfdi metadata</PackageTags>
+    <PackageProjectUrl>https://github.com/nfdi4plants/ARCtrl</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/CWL/ARCtrl.CWL.fsproj b/src/CWL/ARCtrl.CWL.fsproj
@@ -11,7 +11,22 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fable.Core" Version="[4.0.0]" />
+    <PackageReference Include="Fable.Core" Version="4.0.0" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <Authors>nfdi4plants</Authors>
+    <Description>ARC helper functions for Common workflow language.</Description>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageIcon>https://raw.githubusercontent.com/nfdi4plants/Branding/138420e3b6f9ec9e125c1ca8840874b2be2a1262/logos/DataPLANT_logo_minimal_rounded_bg_transparent.svg</PackageIcon>
+    <PackageTags>ARC F# FSharp dotnet .Net bioinformatics biology fable-library datascience dataplant nfdi metadata</PackageTags>
+    <PackageProjectUrl>https://github.com/nfdi4plants/ARCtrl/tree/main/src/CWL</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/Contract/ARCtrl.Contract.fsproj b/src/Contract/ARCtrl.Contract.fsproj
@@ -6,15 +6,28 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fable.Core" Version="[4.0.0]" />
-    <PackageReference Include="FsSpreadsheet" Version="2.0.1" />
+    <PackageReference Include="Fable.Core" Version="4.0.0" />
   </ItemGroup>
 
   <ItemGroup>
     <None Include="README.md" />
     <Compile Include="Contract.fs" />
   </ItemGroup>
 
-  <ItemGroup />
+  <ItemGroup>
+    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
+  </ItemGroup>
 
+  <PropertyGroup>
+    <Authors>nfdi4plants, Kevin Frey, Lukas Weil, Kevin Schneider, Oliver Maus</Authors>
+    <Description>ARC helper functions for contracts management.</Description>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageIcon>https://raw.githubusercontent.com/nfdi4plants/Branding/138420e3b6f9ec9e125c1ca8840874b2be2a1262/logos/DataPLANT_logo_minimal_rounded_bg_transparent.svg</PackageIcon>
+    <PackageTags>ARC F# FSharp dotnet .Net bioinformatics biology fable-library datascience dataplant nfdi metadata</PackageTags>
+    <PackageProjectUrl>https://github.com/nfdi4plants/ARCtrl/tree/main/src/Contract</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+
+
 </Project>
diff --git a/src/Contract/Contract.fs b/src/Contract/Contract.fs
@@ -1,7 +1,6 @@
 namespace ARCtrl.Contract
 
 open Fable.Core
-open FsSpreadsheet
 open Fable.Core.JsInterop
 
 [<StringEnum>]

diff --git a/src/FileSystem/ARCtrl.FileSystem.fsproj b/src/FileSystem/ARCtrl.FileSystem.fsproj
@@ -13,8 +13,24 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Fable.Core" Version="[4.0.0]" />
-    <PackageReference Include="FsSpreadsheet" Version="3.1.1" />
+    <PackageReference Include="Fable.Core" Version="4.0.0" />
+    <PackageReference Update="FSharp.Core" Version="6.0.7" />
   </ItemGroup>
 
+
+  <ItemGroup>
+    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <Authors>nfdi4plants, Kevin Frey, Lukas Weil </Authors>
+    <Description>ARC helper functions for filesystem management.</Description>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageIcon>https://raw.githubusercontent.com/nfdi4plants/Branding/138420e3b6f9ec9e125c1ca8840874b2be2a1262/logos/DataPLANT_logo_minimal_rounded_bg_transparent.svg</PackageIcon>
+    <PackageTags>ARC F# FSharp dotnet .Net bioinformatics biology fable-library datascience dataplant nfdi metadata</PackageTags>
+    <PackageProjectUrl>https://github.com/nfdi4plants/ARCtrl/tree/main/src/FileSystem</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/ISA/ISA.Json/ARCtrl.ISA.Json.fsproj b/src/ISA/ISA.Json/ARCtrl.ISA.Json.fsproj
@@ -32,10 +32,6 @@
     <PackageReference Include="Thoth.Json.Net" Version="11.0.0" />
   </ItemGroup>
 
-  <!-- Add source files to "fable" folder in Nuget package -->
-  <ItemGroup>
-  	<Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ISA\ARCtrl.ISA.fsproj" />
   </ItemGroup>
@@ -48,4 +44,26 @@
   		<NpmPackage Name="fable-library" Version="1.4.1" ResolutionStrategy="Max" />
   	</NpmDependencies>
   </PropertyGroup>
+
+  <ItemGroup>
+    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
+  </ItemGroup>
+
+  <PropertyGroup>
+    <NpmDependencies>
+      <NpmPackage Name="jsonschema" Version="gte 1.4.1 lt 1.5.0" ResolutionStrategy="Max" />
+    </NpmDependencies>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <Authors>nfdi4plants, Lukas Weil, Florian Wetzels, Kevin Frey</Authors>
+    <Description>ARC and ISA json compliant parser for experimental metadata toolkit in F#. This project is meant as an easy means to open, manipulate and save ISA (Investigation,Study,Assay) metadata files in isa-json format.</Description>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageIcon>https://raw.githubusercontent.com/nfdi4plants/Branding/138420e3b6f9ec9e125c1ca8840874b2be2a1262/logos/DataPLANT_logo_minimal_rounded_bg_transparent.svg</PackageIcon>
+    <PackageTags>ARC F# FSharp dotnet .Net bioinformatics biology fable-library datascience dataplant nfdi metadata investigation study assay ISA Json</PackageTags>
+    <PackageProjectUrl>https://github.com/nfdi4plants/ARCtrl/tree/main/src/ISA</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
+  </PropertyGroup>
+
 </Project>
diff --git a/src/ISA/ISA.Spreadsheet/ARCtrl.ISA.Spreadsheet.fsproj b/src/ISA/ISA.Spreadsheet/ARCtrl.ISA.Spreadsheet.fsproj
@@ -34,9 +34,6 @@
 
   <ItemGroup>
     <PackageReference Include="FsSpreadsheet" Version="3.3.0" />
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="6.0.7" />
   </ItemGroup>
 
@@ -45,18 +42,19 @@
     <ProjectReference Include="..\..\FileSystem\ARCtrl.FileSystem.fsproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
+  </ItemGroup>
+
   <PropertyGroup>
-    <Authors>nfdi4plants, Lukas Weil, Kevin Frey</Authors>
-    <Title>ISA.Spreadsheet</Title>
-    <Description>Excel File IO methods for ISA compliant experimental metadata toolkit in F#. The underlying datamodel can be directly read from and written to ISA-Json and ISA-Excel (ISATab format) files.</Description>
+    <Authors>nfdi4plants, Lukas Weil</Authors>
+    <Description>ARC and ISA xlsx compliant parser for experimental metadata toolkit in F#. This project is meant as an easy means to open, manipulate and save ISA (Investigation,Study,Assay) metadata files in isa-xlsx format.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <!--<PackageProjectUrl>https://fslab.org/docs-template/</PackageProjectUrl>-->
-    <PackageIconUrl>https://raw.githubusercontent.com/nfdi4plants/Branding/138420e3b6f9ec9e125c1ca8840874b2be2a1262/logos/DataPLANT_logo_minimal_rounded_bg_transparent.svg</PackageIconUrl>
-    <PackageTags>F# FSharp dotnet .Net bioinformatics biology datascience dataplant nfdi metadata investigation study assay ISA Excel XLSX Tab</PackageTags>
-    <RepositoryUrl>https://github.com/nfdi4plants/ISA</RepositoryUrl>
+    <PackageIcon>https://raw.githubusercontent.com/nfdi4plants/Branding/138420e3b6f9ec9e125c1ca8840874b2be2a1262/logos/DataPLANT_logo_minimal_rounded_bg_transparent.svg</PackageIcon>
+    <PackageTags>ARC F# FSharp dotnet .Net bioinformatics biology fable-library datascience dataplant nfdi metadata investigation study assay ISA Spreadsheet xlsx excel</PackageTags>
+    <PackageProjectUrl>https://github.com/nfdi4plants/ARCtrl/tree/main/src/ISA</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <FsDocsLicenseLink>https://github.com/nfdi4plants/ISA/blob/developer/LICENSE</FsDocsLicenseLink>
-    <FsDocsReleaseNotesLink>https://github.com/nfdi4plants/ISA/blob/developer/RELEASE_NOTES.md</FsDocsReleaseNotesLink>
   </PropertyGroup>
-  
+
 </Project>
diff --git a/src/ISA/ISA/ARCtrl.ISA.fsproj b/src/ISA/ISA/ARCtrl.ISA.fsproj
@@ -74,19 +74,21 @@
 
   <ItemGroup>
     <PackageReference Update="FSharp.Core" Version="6.0.7" />
-  </ItemGroup> 
-
+  </ItemGroup>
+
+  <ItemGroup>
+    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
+  </ItemGroup>
+
   <PropertyGroup>
-     <Authors>nfdi4plants, Lukas Weil, Kevin Frey</Authors>
-    <Description>ISA compliant experimental metadata toolkit in F#. This project is meant as an easy means to open, manipulate and save ISA (Investigation,Study,Assay) metadata files in the dotnet environment.</Description>
+    <Authors>nfdi4plants, Lukas Weil, Kevin Frey, Kevin Schneider, Oliver Muas</Authors>
+    <Description>ARC and ISA compliant experimental metadata toolkit in F#. This project is meant as an easy means to open, manipulate and save ISA (Investigation,Study,Assay) metadata files in the dotnet environment.</Description>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <!--<PackageProjectUrl>https://fslab.org/docs-template/</PackageProjectUrl>-->
-    <PackageIconUrl>https://raw.githubusercontent.com/nfdi4plants/Branding/138420e3b6f9ec9e125c1ca8840874b2be2a1262/logos/DataPLANT_logo_minimal_rounded_bg_transparent.svg</PackageIconUrl>
-    <PackageTags>F# FSharp dotnet .Net bioinformatics biology datascience dataplant nfdi metadata investigation study assay ISA Json</PackageTags>
-    <RepositoryUrl>https://github.com/nfdi4plants/ISA</RepositoryUrl>
-    <RepositoryType>git</RepositoryType>
-    <FsDocsLicenseLink>https://github.com/nfdi4plants/ISA/blob/developer/LICENSE</FsDocsLicenseLink>
-    <FsDocsReleaseNotesLink>https://github.com/nfdi4plants/ISA/blob/developer/RELEASE_NOTES.md</FsDocsReleaseNotesLink>
+    <PackageIcon>https://raw.githubusercontent.com/nfdi4plants/Branding/138420e3b6f9ec9e125c1ca8840874b2be2a1262/logos/DataPLANT_logo_minimal_rounded_bg_transparent.svg</PackageIcon>
+    <PackageTags>ARC F# FSharp dotnet .Net bioinformatics biology fable-library datascience dataplant nfdi metadata investigation study assay ISA Json</PackageTags>
+    <PackageProjectUrl>https://github.com/nfdi4plants/ARCtrl/tree/main/src/ISA</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>  
   </PropertyGroup>
 
 </Project>
diff --git a/...et.QueryModel/ISADotNet.QueryModel.fsproj → ...t.QueryModel/ISADotNet.QueryModel.fsproj_ b/...et.QueryModel/ISADotNet.QueryModel.fsproj → ...t.QueryModel/ISADotNet.QueryModel.fsproj_