remove paket from project ✅

nfdi4plants · Oct 30, 2023 · 3f716d6 · 3f716d6
1 parent d9e5d93
commit 3f716d6
Show file tree

Hide file tree

Showing 42 changed files with 47 additions and 747 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -7,12 +7,6 @@
       "commands": [
         "fable"
       ]
-    },
-    "paket": {
-      "version": "7.2.1",
-      "commands": [
-        "paket"
-      ]
     }
   }
 }
diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/ARCtrl.sln b/ARCtrl.sln
@@ -12,7 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.config\dotnet-tools.json = .config\dotnet-tools.json
 		global.json = global.json
 		package.json = package.json
-		paket.dependencies = paket.dependencies
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md
 	EndProjectSection

diff --git a/build.cmd b/build.cmd
@@ -1,6 +1,5 @@
 @echo off
 
 dotnet tool restore
-dotnet paket restore
 cls 
 dotnet run --project ./build/build.fsproj %*
diff --git a/build.sh b/build.sh
@@ -3,6 +3,4 @@
 set -eu
 set -o pipefail
 
-dotnet paket restore
-
 dotnet run --project ./build/Build.fsproj "$@"
diff --git a/build/Build.fsproj b/build/Build.fsproj
@@ -6,7 +6,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Content Include="release_package.json" />
-    <None Include="paket.references" />
     <Compile Include="Helpers.fs" />
     <Compile Include="MessagePrompts.fs" />
     <Compile Include="ProjectInfo.fs" />
@@ -31,5 +30,4 @@
     <PackageReference Include="Fake.Tools.Git" Version="5.23.0-alpha002" />
     <PackageReference Include="Fake.Extensions.Release" Version="0.3.0" />
   </ItemGroup>
-  <Import Project="..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/build/TestTasks.fs b/build/TestTasks.fs
@@ -136,17 +136,9 @@ module RunTests =
     }
 
     let runTestsDotnet = BuildTask.create "runTestsDotnet" [clean; build] {
+        let dotnetRun = run dotnet "run"
         testProjects
-        |> Seq.iter (fun testProject ->
-            Fake.DotNet.DotNet.test(fun testParams ->
-                {
-                    testParams with
-                        Logger = Some "console;verbosity=detailed"
-                        Configuration = DotNet.BuildConfiguration.fromString configuration
-                        NoBuild = true
-                }
-            ) testProject
-        )
+        |> Seq.iter dotnetRun
     }
 
 let runTests = BuildTask.create "RunTests" [clean; build; RunTests.runTestsJs; RunTests.runTestsJsNative; RunTests.runTestsDotnet] { 

diff --git a/build/paket.references b/build/paket.references
diff --git a/paket.dependencies b/paket.dependencies
diff --git a/paket.lock b/paket.lock
diff --git a/src/ARCtrl/ARCtrl.fsproj b/src/ARCtrl/ARCtrl.fsproj
@@ -18,7 +18,6 @@
     <None Include="../../build/logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="paket.references" />
     <Compile Include="Path.fs" />
     <Compile Include="FileSystemTree.fs" />
     <Compile Include="SemVer.fs" />
@@ -36,6 +35,10 @@
     <Compile Include="ARC.fs" />
     <None Include="README.md" />
   </ItemGroup>
+	<ItemGroup>
+		<PackageReference 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" />
@@ -49,5 +52,4 @@
       <NpmPackage Name="isomorphic-fetch" Version="gt 3.0.0 lt 3.0.0" ResolutionStrategy="Max" />
     </NpmDependencies>
   </PropertyGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/ARCtrl/paket.references b/src/ARCtrl/paket.references
diff --git a/src/CWL/ARCtrl.CWL.fsproj b/src/CWL/ARCtrl.CWL.fsproj
@@ -5,7 +5,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="paket.references" />
     <None Include="../../build/logo.png" Pack="true" PackagePath="\" />
     <Compile Include="Path.fs" />
     <Compile Include="Library.fs" />
@@ -23,5 +22,4 @@
     <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/CWL/paket.references b/src/CWL/paket.references
diff --git a/src/Contract/ARCtrl.Contract.fsproj b/src/Contract/ARCtrl.Contract.fsproj
@@ -5,14 +5,16 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="paket.references" />
     <None Include="README.md" />
     <Compile Include="Contract.fs" />
     <None Include="../../build/logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ISA\ISA\ARCtrl.ISA.fsproj" />
+  </ItemGroup>
   <PropertyGroup>
     <Authors>nfdi4plants, Kevin Frey, Lukas Weil, Kevin Schneider, Oliver Maus</Authors>
     <Description>ARC helper functions for contracts management.</Description>
@@ -23,5 +25,4 @@
     <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/Contract/paket.references b/src/Contract/paket.references
diff --git a/src/FileSystem/ARCtrl.FileSystem.fsproj b/src/FileSystem/ARCtrl.FileSystem.fsproj
@@ -5,17 +5,21 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
-    <None Include="paket.references" />
     <Compile Include="Path.fs" />
     <Compile Include="Commit.fs" />
     <Compile Include="DefaultGitignore.fs" />
     <Compile Include="FileSystemTree.fs" />
     <Compile Include="FileSystem.fs" />
   </ItemGroup>
+	<ItemGroup>
+		<Content Include="*.fsproj; **\*.fs; **\*.fsi" PackagePath="fable\" />
+	</ItemGroup>
   <ItemGroup>
     <None Include="../../build/logo.png" Pack="true" PackagePath="\" />
   </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>
@@ -26,5 +30,4 @@
     <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/FileSystem/paket.references b/src/FileSystem/paket.references
diff --git a/src/ISA/ISA.Json/ARCtrl.ISA.Json.fsproj b/src/ISA/ISA.Json/ARCtrl.ISA.Json.fsproj
@@ -5,7 +5,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="paket.references" />
     <EmbeddedResource Include="Validation\JsonValidation.js">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </EmbeddedResource>
@@ -46,11 +45,6 @@
   <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>
@@ -61,5 +55,4 @@
     <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
-  <Import Project="..\..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/ISA/ISA.Json/paket.references b/src/ISA/ISA.Json/paket.references
diff --git a/src/ISA/ISA.Spreadsheet/ARCtrl.ISA.Spreadsheet.fsproj b/src/ISA/ISA.Spreadsheet/ARCtrl.ISA.Spreadsheet.fsproj
@@ -8,7 +8,6 @@
     <EmbeddedResource Remove="StudyFile\**" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="paket.references" />
     <Compile Include="AssemblyInfo.fs" />
     <Compile Include="CollectionAux.fs" />
     <Compile Include="Metadata\Conversions.fs" />
@@ -32,6 +31,9 @@
     <Compile Include="ArcInvestigation.fs" />
     <None Include="../../../build/logo.png" Pack="true" PackagePath="\" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FsSpreadsheet" Version="5.0.1" />
+  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\ISA\ARCtrl.ISA.fsproj" />
     <ProjectReference Include="..\..\FileSystem\ARCtrl.FileSystem.fsproj" />
@@ -46,5 +48,4 @@
     <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
-  <Import Project="..\..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/ISA/ISA.Spreadsheet/paket.references b/src/ISA/ISA.Spreadsheet/paket.references
diff --git a/src/ISA/ISA/ARCtrl.ISA.fsproj b/src/ISA/ISA/ARCtrl.ISA.fsproj
@@ -5,7 +5,6 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="paket.references" />
     <Compile Include="Path.fs" />
     <Compile Include="Identifier.fs" />
     <Compile Include="Url.fs" />
@@ -77,5 +76,4 @@
     <RepositoryUrl>https://github.com/nfdi4plants/ARCtrl</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
   </PropertyGroup>
-  <Import Project="..\..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/ISA/ISA/paket.references b/src/ISA/ISA/paket.references
diff --git a/tests/ARCtrl/ARCtrl.Tests.fsproj b/tests/ARCtrl/ARCtrl.Tests.fsproj
@@ -6,7 +6,6 @@
     <GenerateProgramFile>false</GenerateProgramFile>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="paket.references" />
     <Compile Include="SemVer.Tests.fs" />
     <Compile Include="Template.Tests.fs" />
     <Compile Include="WebRequest.Tests.fs" />
@@ -18,5 +17,7 @@
     <ProjectReference Include="..\..\src\ARCtrl\ARCtrl.fsproj" />
     <ProjectReference Include="..\TestingUtils\TestingUtils.fsproj" />
   </ItemGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
+  <ItemGroup>
+    <PackageReference Update="FSharp.Core" Version="7.0.401" />
+  </ItemGroup>
 </Project>
diff --git a/tests/ARCtrl/Main.fs b/tests/ARCtrl/Main.fs
@@ -7,7 +7,7 @@ open Expecto
 
 [<Tests>]
 #endif
-let all = testSequenced <| testList "All" [
+let all = testSequenced <| testList "ARCtrl" [
     ARCtrl.Contracts.Tests.main
     ARCtrl.WebRequest.Tests.main
     ARCtrl.SemVer.Tests.main

diff --git a/tests/ARCtrl/paket.references b/tests/ARCtrl/paket.references