Skip to content

Commit

Permalink
move duplicate project references into props files
Browse files Browse the repository at this point in the history
  • Loading branch information
@HLWeil
HLWeil committed Oct 2, 2024
1 parent 3586dee commit 755879d
Show file tree
Hide file tree
Showing 14 changed files with 83 additions and 230 deletions.
12 changes: 12 additions & 0 deletions Directory.Build.props
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
<Project>

<PropertyGroup>
<Authors>nfdi4plants, Lukas Weil, Kevin Frey, Kevin Schneider, Florian Wetzels</Authors>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>logo.png</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>

<!-- Make F# support Central Package Management -->
<PropertyGroup>
<DisableImplicitSystemValueTupleReference>true</DisableImplicitSystemValueTupleReference>
Expand All @@ -16,4 +27,5 @@
<!-- Make all the projects use the highest warning level -->
<WarningLevel>3</WarningLevel>
</PropertyGroup>

</Project>
58 changes: 58 additions & 0 deletions src/ARCtrl/ARCtrl.Common.props
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<Project>
<PropertyGroup>
<Description>Library for management of Annotated Research Contexts (ARCs) using an in-memory representation and runtime agnostic contract systems.</Description>
</PropertyGroup>
<ItemGroup>
<Compile Include="Json\Decode.fs" />
<Compile Include="Json\Encode.fs" />
<Compile Include="Json\Comment.fs" />
<Compile Include="Json\OntologyAnnotation.fs" />
<Compile Include="Json\OntologySourceReference.fs" />
<Compile Include="Json\DataFile.fs" />
<Compile Include="Json\Data.fs" />
<Compile Include="Json\Person.fs" />
<Compile Include="Json\Publication.fs" />
<Compile Include="Json\Process\Value.fs" />
<Compile Include="Json\Process\Factor.fs" />
<Compile Include="Json\Process\FactorValue.fs" />
<Compile Include="Json\Process\ProtocolParameter.fs" />
<Compile Include="Json\Process\MaterialType.fs" />
<Compile Include="Json\Process\MaterialAttribute.fs" />
<Compile Include="Json\Process\Component.fs" />
<Compile Include="Json\Process\Protocol.fs" />
<Compile Include="Json\Process\MaterialAttributeValue.fs" />
<Compile Include="Json\Process\Material.fs" />
<Compile Include="Json\Process\Source.fs" />
<Compile Include="Json\Process\Sample.fs" />
<Compile Include="Json\Process\ProcessParameterValue.fs" />
<Compile Include="Json\Process\ProcessInput.fs" />
<Compile Include="Json\Process\ProcessOutput.fs" />
<Compile Include="Json\Process\Process.fs" />
<Compile Include="Json\Process\ProcessSequence.fs" />
<Compile Include="Json\Process\StudyMaterials.fs" />
<Compile Include="Json\Table\Compression.fs" />
<Compile Include="Json\Table\CompositeCell.fs" />
<Compile Include="Json\Table\IOType.fs" />
<Compile Include="Json\Table\CompositeHeader.fs" />
<Compile Include="Json\Table\ArcTable.fs" />
<Compile Include="Json\Table\Templates.fs" />
<Compile Include="Json\DataMap\DataMap.fs" />
<Compile Include="Json\Assay.fs" />
<Compile Include="Json\Study.fs" />
<Compile Include="Json\Investigation.fs" />
<Compile Include="Json\ROCrateObject.fs" />
<Compile Include="Json\ARC.fs" />
<None Include="README.md" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Contract\ARCtrl.Contract.fsproj" />
<ProjectReference Include="..\CWL\ARCtrl.CWL.fsproj" />
<ProjectReference Include="..\ROCrate\ARCtrl.ROCrate.fsproj" />
<ProjectReference Include="..\FileSystem\ARCtrl.FileSystem.fsproj" />
<ProjectReference Include="..\Json\ARCtrl.Json.fsproj" />
<ProjectReference Include="..\Spreadsheet\ARCtrl.Spreadsheet.fsproj" />
</ItemGroup>
<ItemGroup>
<None Include="../../build/logo.png" Pack="true" PackagePath="\" />
</ItemGroup>
</Project>
64 changes: 3 additions & 61 deletions src/ARCtrl/ARCtrl.Javascript.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,86 +5,28 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<DefineConstants>FABLE_COMPILER_JAVASCRIPT;FABLE_COMPILER;FABLE_COMPILER_TYPESCRIPT</DefineConstants>
</PropertyGroup>
<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>logo.png</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>
<Import Project="ARCtrl.Common.props" />
<ItemGroup>
<Compile Include="Json\Decode.fs" />
<Compile Include="Json\Encode.fs" />
<Compile Include="Json\Comment.fs" />
<Compile Include="Json\OntologyAnnotation.fs" />
<Compile Include="Json\OntologySourceReference.fs" />
<Compile Include="Json\DataFile.fs" />
<Compile Include="Json\Data.fs" />
<Compile Include="Json\Person.fs" />
<Compile Include="Json\Publication.fs" />
<Compile Include="Json\Process\Value.fs" />
<Compile Include="Json\Process\Factor.fs" />
<Compile Include="Json\Process\FactorValue.fs" />
<Compile Include="Json\Process\ProtocolParameter.fs" />
<Compile Include="Json\Process\MaterialType.fs" />
<Compile Include="Json\Process\MaterialAttribute.fs" />
<Compile Include="Json\Process\Component.fs" />
<Compile Include="Json\Process\Protocol.fs" />
<Compile Include="Json\Process\MaterialAttributeValue.fs" />
<Compile Include="Json\Process\Material.fs" />
<Compile Include="Json\Process\Source.fs" />
<Compile Include="Json\Process\Sample.fs" />
<Compile Include="Json\Process\ProcessParameterValue.fs" />
<Compile Include="Json\Process\ProcessInput.fs" />
<Compile Include="Json\Process\ProcessOutput.fs" />
<Compile Include="Json\Process\Process.fs" />
<Compile Include="Json\Process\ProcessSequence.fs" />
<Compile Include="Json\Process\StudyMaterials.fs" />
<Compile Include="Json\Table\Compression.fs" />
<Compile Include="Json\Table\CompositeCell.fs" />
<Compile Include="Json\Table\IOType.fs" />
<Compile Include="Json\Table\CompositeHeader.fs" />
<Compile Include="Json\Table\ArcTable.fs" />
<Compile Include="Json\Table\Templates.fs" />
<Compile Include="Json\DataMap\DataMap.fs" />
<Compile Include="Json\Assay.fs" />
<Compile Include="Json\Study.fs" />
<Compile Include="Json\Investigation.fs" />
<Compile Include="Json\ROCrateObject.fs" />
<Compile Include="Json\ARC.fs" />
<Compile Include="WebRequest\WebRequest.Node.fs" />
<Compile Include="WebRequest\WebRequest.fs" />
<Compile Include="Template.Web.fs" />
<Compile Include="ARC.fs" />
<Compile Include="Json.fs" />
<Compile Include="Xlsx.fs" />
<None Include="README.md" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fable.Fetch"/>
<PackageReference Include="Fable.SimpleHttp"/>
<PackageReference Include="Thoth.Json.Javascript"/>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Contract\ARCtrl.Contract.fsproj" />
<ProjectReference Include="..\CWL\ARCtrl.CWL.fsproj" />
<ProjectReference Include="..\FileSystem\ARCtrl.FileSystem.fsproj" />
<ProjectReference Include="..\Json\ARCtrl.Json.fsproj" />
<ProjectReference Include="..\Spreadsheet\ARCtrl.Spreadsheet.fsproj" />
</ItemGroup>

<ItemGroup>
<Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
<None Include="../../build/logo.png" Pack="true" PackagePath="\" />
</ItemGroup>
<PropertyGroup>
<NpmDependencies>
<NpmPackage Name="isomorphic-fetch" Version="gt 3.0.0 lt 3.0.0" ResolutionStrategy="Max" />
</NpmDependencies>
</PropertyGroup>
<ItemGroup>
<PackageReference Update="FSharp.Core" Version="8.0.400" />
</ItemGroup>

</Project>
61 changes: 2 additions & 59 deletions src/ARCtrl/ARCtrl.Python.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,74 +5,17 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<DefineConstants>FABLE_COMPILER_PYTHON;FABLE_COMPILER</DefineConstants>
</PropertyGroup>
<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>logo.png</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>
<ItemGroup>
<Compile Include="Json\Decode.fs" />
<Compile Include="Json\Encode.fs" />
<Compile Include="Json\Comment.fs" />
<Compile Include="Json\OntologyAnnotation.fs" />
<Compile Include="Json\OntologySourceReference.fs" />
<Compile Include="Json\DataFile.fs" />
<Compile Include="Json\Data.fs" />
<Compile Include="Json\Person.fs" />
<Compile Include="Json\Publication.fs" />
<Compile Include="Json\Process\Value.fs" />
<Compile Include="Json\Process\Factor.fs" />
<Compile Include="Json\Process\FactorValue.fs" />
<Compile Include="Json\Process\ProtocolParameter.fs" />
<Compile Include="Json\Process\MaterialType.fs" />
<Compile Include="Json\Process\MaterialAttribute.fs" />
<Compile Include="Json\Process\Component.fs" />
<Compile Include="Json\Process\Protocol.fs" />
<Compile Include="Json\Process\MaterialAttributeValue.fs" />
<Compile Include="Json\Process\Material.fs" />
<Compile Include="Json\Process\Source.fs" />
<Compile Include="Json\Process\Sample.fs" />
<Compile Include="Json\Process\ProcessParameterValue.fs" />
<Compile Include="Json\Process\ProcessInput.fs" />
<Compile Include="Json\Process\ProcessOutput.fs" />
<Compile Include="Json\Process\Process.fs" />
<Compile Include="Json\Process\ProcessSequence.fs" />
<Compile Include="Json\Process\StudyMaterials.fs" />
<Compile Include="Json\Table\Compression.fs" />
<Compile Include="Json\Table\CompositeCell.fs" />
<Compile Include="Json\Table\IOType.fs" />
<Compile Include="Json\Table\CompositeHeader.fs" />
<Compile Include="Json\Table\ArcTable.fs" />
<Compile Include="Json\Table\Templates.fs" />
<Compile Include="Json\DataMap\DataMap.fs" />
<Compile Include="Json\Assay.fs" />
<Compile Include="Json\Study.fs" />
<Compile Include="Json\Investigation.fs" />
<Compile Include="Json\ROCrateObject.fs" />
<Compile Include="Json\ARC.fs" />
<Import Project="ARCtrl.Common.props" />
<ItemGroup>
<Compile Include="WebRequest\WebRequest.Py.fs" />
<Compile Include="WebRequest\WebRequest.fs" />
<Compile Include="Template.Web.fs" />
<Compile Include="ARC.fs" />
<Compile Include="Json.fs" />
<Compile Include="Xlsx.fs" />
<None Include="README.md" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Contract\ARCtrl.Contract.fsproj" />
<ProjectReference Include="..\CWL\ARCtrl.CWL.fsproj" />
<ProjectReference Include="..\FileSystem\ARCtrl.FileSystem.fsproj" />
<ProjectReference Include="..\Json\ARCtrl.Json.fsproj" />
<ProjectReference Include="..\Spreadsheet\ARCtrl.Spreadsheet.fsproj" />
</ItemGroup>
<ItemGroup>
<Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
<None Include="../../build/logo.png" Pack="true" PackagePath="\" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Thoth.Json.Python"/>
Expand Down
67 changes: 5 additions & 62 deletions src/ARCtrl/ARCtrl.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,77 +4,20 @@
<TargetFramework>netstandard2.0</TargetFramework>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup>
<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>logo.png</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>

<Import Project="ARCtrl.Common.props" />
<ItemGroup>
<Compile Include="Json\Decode.fs" />
<Compile Include="Json\Encode.fs" />
<Compile Include="Json\Comment.fs" />
<Compile Include="Json\OntologyAnnotation.fs" />
<Compile Include="Json\OntologySourceReference.fs" />
<Compile Include="Json\DataFile.fs" />
<Compile Include="Json\Data.fs" />
<Compile Include="Json\Person.fs" />
<Compile Include="Json\Publication.fs" />
<Compile Include="Json\Process\Value.fs" />
<Compile Include="Json\Process\Factor.fs" />
<Compile Include="Json\Process\FactorValue.fs" />
<Compile Include="Json\Process\ProtocolParameter.fs" />
<Compile Include="Json\Process\MaterialType.fs" />
<Compile Include="Json\Process\MaterialAttribute.fs" />
<Compile Include="Json\Process\Component.fs" />
<Compile Include="Json\Process\Protocol.fs" />
<Compile Include="Json\Process\MaterialAttributeValue.fs" />
<Compile Include="Json\Process\Material.fs" />
<Compile Include="Json\Process\Source.fs" />
<Compile Include="Json\Process\Sample.fs" />
<Compile Include="Json\Process\ProcessParameterValue.fs" />
<Compile Include="Json\Process\ProcessInput.fs" />
<Compile Include="Json\Process\ProcessOutput.fs" />
<Compile Include="Json\Process\Process.fs" />
<Compile Include="Json\Process\ProcessSequence.fs" />
<Compile Include="Json\Process\StudyMaterials.fs" />
<Compile Include="Json\Table\Compression.fs" />
<Compile Include="Json\Table\CompositeCell.fs" />
<Compile Include="Json\Table\IOType.fs" />
<Compile Include="Json\Table\CompositeHeader.fs" />
<Compile Include="Json\Table\ArcTable.fs" />
<Compile Include="Json\Table\Templates.fs" />
<Compile Include="Json\DataMap\DataMap.fs" />
<Compile Include="Json\Assay.fs" />
<Compile Include="Json\Study.fs" />
<Compile Include="Json\Investigation.fs" />
<Compile Include="Json\ROCrateObject.fs" />
<Compile Include="Json\ARC.fs" />
<None Include="ARCtrl.Common.props" />
<Compile Include="WebRequest\WebRequest.fs" />
<Compile Include="Template.Web.fs" />
<Compile Include="ARC.fs" />
<Compile Include="Json.fs" />
<Compile Include="Xlsx.fs" />
<None Include="README.md" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Fable.SimpleHttp" />
<PackageReference Include="Thoth.Json.Newtonsoft" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Contract\ARCtrl.Contract.fsproj" />
<ProjectReference Include="..\CWL\ARCtrl.CWL.fsproj" />
<ProjectReference Include="..\ROCrate\ARCtrl.ROCrate.fsproj" />
<ProjectReference Include="..\FileSystem\ARCtrl.FileSystem.fsproj" />
<ProjectReference Include="..\Json\ARCtrl.Json.fsproj" />
<ProjectReference Include="..\Spreadsheet\ARCtrl.Spreadsheet.fsproj" />
</ItemGroup>
<ItemGroup>

<None Include="../../build/logo.png" Pack="true" PackagePath="\" />
</ItemGroup>


</Project>
5 changes: 0 additions & 5 deletions src/CWL/ARCtrl.CWL.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,8 @@
<None Include="../../build/logo.png" Pack="true" PackagePath="\" />
</ItemGroup>
<PropertyGroup>
<Authors>nfdi4plants</Authors>
<Description>ARC helper functions for Common workflow language.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>logo.png</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>
5 changes: 0 additions & 5 deletions src/Contract/ARCtrl.Contract.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,8 @@
<None Include="../../build/logo.png" Pack="true" PackagePath="\" />
</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>logo.png</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>
5 changes: 0 additions & 5 deletions src/Core/ARCtrl.Core.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,8 @@
<ProjectReference Include="..\FileSystem\ARCtrl.FileSystem.fsproj" />
</ItemGroup>
<PropertyGroup>
<Authors>nfdi4plants, Lukas Weil, Kevin Frey, Kevin Schneider, Oliver Maus</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>
<PackageIcon>logo.png</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>
5 changes: 0 additions & 5 deletions src/FileSystem/ARCtrl.FileSystem.fsproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,8 @@
<PackageReference Include="Fable.Core"/>
</ItemGroup>
<PropertyGroup>
<Authors>nfdi4plants, Kevin Frey, Lukas Weil </Authors>
<Description>ARC helper functions for filesystem management.</Description>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<PackageIcon>logo.png</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>
Loading

0 comments on commit 755879d

Please sign in to comment.