Merge pull request #370 from nfdi4plants/missing_fable_includes

Fix missing fable includes #369
nfdi4plants · Jun 7, 2024 · 8f5eaf1 · 8f5eaf1
2 parents 56f3a7a + 1ce8001
commit 8f5eaf1
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 18 deletions.
diff --git a/src/ARCtrl/ARCtrl.fsproj b/src/ARCtrl/ARCtrl.fsproj
@@ -24,10 +24,10 @@
     <Compile Include="Xlsx.fs" />
     <None Include="README.md" />
   </ItemGroup>
-	<ItemGroup>
-		<PackageReference Condition="'$(FABLE_COMPILER_JAVASCRIPT)' == 'true'" Include="Fable.Fetch" Version="2.6.0" />
-		<PackageReference Include="Fable.SimpleHttp" Version="3.5.0" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Condition="'$(FABLE_COMPILER_JAVASCRIPT)' == 'true'" Include="Fable.Fetch" Version="2.6.0" />
+    <PackageReference Include="Fable.SimpleHttp" Version="3.5.0" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Contract\ARCtrl.Contract.fsproj" />
     <ProjectReference Include="..\CWL\ARCtrl.CWL.fsproj" />
@@ -47,7 +47,7 @@
       <Package Name="requests" Version="&gt;= 2.28.1 &lt; 3.0.0" ResolutionStrategy="Max" />
     </PythonDependencies>
   </PropertyGroup>
-	<ItemGroup>
-	  <PackageReference Update="FSharp.Core" Version="7.0.401" />
-	</ItemGroup>
+  <ItemGroup>
+    <PackageReference Update="FSharp.Core" Version="7.0.401" />
+  </ItemGroup>
 </Project>
diff --git a/src/Contract/ARCtrl.Contract.fsproj b/src/Contract/ARCtrl.Contract.fsproj
@@ -20,6 +20,7 @@
     <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>

diff --git a/src/Core/ARCtrl.Core.fsproj b/src/Core/ARCtrl.Core.fsproj
@@ -58,6 +58,7 @@
     <ProjectReference Include="..\FileSystem\ARCtrl.FileSystem.fsproj" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
     <None Include="../../build/logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>

diff --git a/src/FileSystem/ARCtrl.FileSystem.fsproj b/src/FileSystem/ARCtrl.FileSystem.fsproj
@@ -12,12 +12,13 @@
     <Compile Include="FileSystemTree.fs" />
     <Compile Include="FileSystem.fs" />
   </ItemGroup>
-	<ItemGroup>
+  <ItemGroup>
+    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
     <None Include="../../build/logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
-    <ItemGroup>
-	    <PackageReference Include="Fable.Core" Version="4.2.0" />
-    </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Fable.Core" Version="4.2.0" />
+  </ItemGroup>
   <PropertyGroup>
     <Authors>nfdi4plants, Kevin Frey, Lukas Weil </Authors>
     <Description>ARC helper functions for filesystem management.</Description>

diff --git a/src/Json/ARCtrl.Json.fsproj b/src/Json/ARCtrl.Json.fsproj
@@ -61,10 +61,10 @@
     <Compile Include="Process\AssayMaterials.fs" />
     <Compile Include="Process\StudyMaterials.fs" />
     <Compile Include="Table\OATable.fs" />
-	  <Compile Include="Table\CompositeCell.fs" />
-	  <Compile Include="Table\CellTable.fs" />
-	  <Compile Include="Table\IOType.fs" />
-	  <Compile Include="Table\CompositeHeader.fs" />
+    <Compile Include="Table\CompositeCell.fs" />
+    <Compile Include="Table\CellTable.fs" />
+    <Compile Include="Table\IOType.fs" />
+    <Compile Include="Table\CompositeHeader.fs" />
     <Compile Include="Table\ArcTable.fs" />
     <Compile Include="Table\Compression.fs" />
     <Compile Include="Table\Templates.fs" />

diff --git a/src/Spreadsheet/ARCtrl.Spreadsheet.fsproj b/src/Spreadsheet/ARCtrl.Spreadsheet.fsproj
@@ -36,11 +36,9 @@
     <PackageReference Include="FsSpreadsheet" Version="6.1.2" />
   </ItemGroup>
   <ItemGroup>
+    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
     <None Include="../../build/logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Remove="Template.fs" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core\ARCtrl.Core.fsproj" />
     <ProjectReference Include="..\FileSystem\ARCtrl.FileSystem.fsproj" />