chore: Remove paket (#205)

* chore: Replace Paket with NuGet. * Ignore FSharp.Core and System.Configuration.ConfigurationManager by dependabot. * Tidy xml files * Add .editorconfig * Apply rules to proj files * reorder sln text --------- Co-authored-by: Ruben Bartelink <[email protected]>
fsprojects · Dec 14, 2023 · dc7dcd3 · dc7dcd3
1 parent 07c1bbe
commit dc7dcd3
Show file tree

Hide file tree

Showing 20 changed files with 92 additions and 716 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -2,12 +2,6 @@
   "version": 1,
   "isRoot": true,
   "tools": {
-    "paket": {
-      "version": "7.1.5",
-      "commands": [
-        "paket"
-      ]
-    },
     "fake-cli": {
       "version": "5.23.1",
       "commands": [

diff --git a/.dockerignore b/.dockerignore
@@ -183,7 +183,6 @@
 **/release.cmd
 **/release.sh
 **/localpackages/
-**/paket-files
 **/*.orig
 **/docs/content/license.md
 **/docs/content/release-notes.md
@@ -195,8 +194,6 @@
 
 # Deploy artifacts
 artifacts/
-paket-files/
-.paket/load/
 tools/
 
 # Ionide

diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,18 @@
+root = true
+
+# Source files
+[*.{fs,fsx}]
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+insert_final_newline = true
+end_of_line = lf
+
+# Project files
+[*.{csproj,fsproj,props}]
+indent_size = 2
+
+# YAML files
+[*.yml]
+indent_size = 2
+indent_style = space
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -10,3 +10,6 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+    ignore:
+      - dependency-name: "FSharp.Core"
+      - dependency-name: "System.Configuration.ConfigurationManager"
diff --git a/.gitignore b/.gitignore
@@ -187,7 +187,6 @@ nuget/*.nupkg
 release.cmd
 release.sh
 localpackages/
-paket-files
 *.orig
 docs/content/license.md
 docs/content/release-notes.md
@@ -200,8 +199,6 @@ launchSettings.json
 
 # Deploy artifacts
 /artifacts/
-/paket-files/
-/.paket/load/
 /tools/
 
 # Ionide

diff --git a/.paket/Paket.Restore.targets b/.paket/Paket.Restore.targets
diff --git a/Argu.sln b/Argu.sln
@@ -21,31 +21,23 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{EE42293D-9398-4EF4-B151-9DE992EBB85A}"
 	ProjectSection(SolutionItems) = preProject
 		.github\workflows\build.yml = .github\workflows\build.yml
+		.github\workflows\release.yml = .github\workflows\release.yml
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".paket", ".paket", "{306D68AD-1E01-4367-9498-EF4CEDE0AF38}"
-	ProjectSection(SolutionItems) = preProject
-		.paket\Paket.Restore.targets = .paket\Paket.Restore.targets
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2687163A-E0EA-4EC6-A388-430314AA8C85}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".project", ".project", "{2687163A-E0EA-4EC6-A388-430314AA8C85}"
 	ProjectSection(SolutionItems) = preProject
 		.dockerignore = .dockerignore
+		.editorconfig = .editorconfig
 		.gitignore = .gitignore
-		.tfignore = .tfignore
-		.travis.yml = .travis.yml
-		appveyor.yml = appveyor.yml
-		Argu.sln = Argu.sln
 		build.cmd = build.cmd
 		build.fsx = build.fsx
 		build.sh = build.sh
 		Directory.Build.props = Directory.Build.props
+		Directory.Packages.props = Directory.Packages.props
 		docker-build.sh = docker-build.sh
 		Dockerfile = Dockerfile
 		global.json = global.json
 		LICENSE.md = LICENSE.md
-		paket.dependencies = paket.dependencies
-		paket.lock = paket.lock
 		README.md = README.md
 		RELEASE_NOTES.md = RELEASE_NOTES.md
 	EndProjectSection
@@ -70,10 +62,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "resource", "resource", "{B1
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{A15390A5-BC39-433F-BA25-8775B4C2E329}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{93AB3CBB-7714-49DD-9C6F-40E153A66E8F}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{E40F0B06-703E-4541-826F-3B8AED67AF7B}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -100,8 +88,6 @@ Global
 		{EE42293D-9398-4EF4-B151-9DE992EBB85A} = {83FE66F8-6E59-4178-8962-11117B51F39C}
 		{10ED3503-22F2-42EF-8B35-C979A5B700D0} = {C9E28045-41C6-422E-9928-4220EF3FF19B}
 		{E0563A30-4451-4DF2-9D21-26C76EB85C22} = {A15390A5-BC39-433F-BA25-8775B4C2E329}
-		{D3E958F9-5FFF-462E-BDC7-A03272A9F5D9} = {93AB3CBB-7714-49DD-9C6F-40E153A66E8F}
-		{8E234746-5098-4400-98F1-62C77AB91711} = {E40F0B06-703E-4541-826F-3B8AED67AF7B}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {99215464-9AB5-4BC3-A033-92EA250F8FC1}

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,6 +2,7 @@
   <PropertyGroup>
     <WarningLevel>5</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
   </PropertyGroup>
 
   <!-- NuGet Metadata -->
@@ -15,10 +16,10 @@
     <PackageProjectUrl>https://fsprojects.github.io/Argu/</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
   </PropertyGroup>
-  
+
   <!-- FsDocs -->
   <PropertyGroup>
     <FsDocsLicenseLink>https://github.com/fsprojects/Argu/blob/master/LICENSE.md</FsDocsLicenseLink>
     <FsDocsReleaseNotesLink>https://github.com/fsprojects/Argu/blob/master/RELEASE_NOTES.md</FsDocsReleaseNotesLink>
   </PropertyGroup>
-</Project>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,19 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <!-- Build deps -->
+    <PackageVersion Include="DotNet.ReproducibleBuilds" Version="1.1.1"/>
+
+    <!-- Impl deps -->
+    <PackageVersion Include="FSharp.Core" Version="4.3.2"/>
+    <PackageVersion Include="System.Configuration.ConfigurationManager" Version="4.4.0"/>
+
+    <!-- Test deps -->
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.3.2"/>
+    <PackageVersion Include="xunit" Version="2.4.2"/>
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.4.5"/>
+    <PackageVersion Include="Unquote" Version="6.1.0"/>
+  </ItemGroup>
+</Project>
diff --git a/build.cmd b/build.cmd
@@ -1,7 +1,4 @@
 @echo off
 
-export PAKET_SKIP_RESTORE_TARGETS=true
-
 dotnet tool restore
-dotnet paket restore
 dotnet fsi build.fsx %*
diff --git a/build.sh b/build.sh
@@ -2,8 +2,5 @@
 
 cd `dirname $0`
 
-export PAKET_SKIP_RESTORE_TARGETS=true
-
 dotnet tool restore && \
-dotnet paket restore && \
 dotnet fsi build.fsx "$@"
diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <!--To inherit the global NuGet package sources remove the <clear/> line below -->
+    <clear />
+    <add key="nuget" value="https://api.nuget.org/v3/index.json" />
+  </packageSources>
+  <packageSourceMapping>
+  <packageSource key="nuget">
+    <package pattern="*" />
+  </packageSource>
+  </packageSourceMapping>
+</configuration>
diff --git a/paket.dependencies b/paket.dependencies
diff --git a/paket.lock b/paket.lock
diff --git a/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj b/samples/Argu.Samples.LS/Argu.Samples.LS.fsproj
@@ -7,12 +7,10 @@
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Arguments.fs" />
-    <Compile Include="Program.fs" />
-    <None Include="paket.references" />
+    <Compile Include="Arguments.fs"/>
+    <Compile Include="Program.fs"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Argu\Argu.fsproj" />
+    <ProjectReference Include="..\..\src\Argu\Argu.fsproj"/>
   </ItemGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/samples/Argu.Samples.LS/paket.references b/samples/Argu.Samples.LS/paket.references
diff --git a/src/Argu/Argu.fsproj b/src/Argu/Argu.fsproj
@@ -1,30 +1,31 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <GenerateAssemblyInfo>true</GenerateAssemblyInfo>
     <PackageIcon>logo.png</PackageIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Types.fs" />
-    <Compile Include="Attributes.fs" />
-    <Compile Include="Utils.fs" />
-    <Compile Include="ConfigReaders.fs" />
-    <Compile Include="UnionArgInfo.fs" />
-    <Compile Include="PreCompute.fs" />
-    <Compile Include="UnParsers.fs" />
-    <Compile Include="ParseResults.fs" />
-    <Compile Include="Parsers\Common.fs" />
-    <Compile Include="Parsers\Cli.fs" />
-    <Compile Include="Parsers\KeyValue.fs" />
-    <Compile Include="ArgumentParser.fs" />
-    <None Include="paket.references" />
-    <None Include="..\..\resource\logo.png" Pack="true" PackagePath="" />
+    <Compile Include="Types.fs"/>
+    <Compile Include="Attributes.fs"/>
+    <Compile Include="Utils.fs"/>
+    <Compile Include="ConfigReaders.fs"/>
+    <Compile Include="UnionArgInfo.fs"/>
+    <Compile Include="PreCompute.fs"/>
+    <Compile Include="UnParsers.fs"/>
+    <Compile Include="ParseResults.fs"/>
+    <Compile Include="Parsers\Common.fs"/>
+    <Compile Include="Parsers\Cli.fs"/>
+    <Compile Include="Parsers\KeyValue.fs"/>
+    <Compile Include="ArgumentParser.fs"/>
+    <None Include="..\..\resource\logo.png" Pack="true" PackagePath=""/>
   </ItemGroup>
   <ItemGroup>
     <!-- SourceLink etc -->
-    <PackageReference Include="DotNet.ReproducibleBuilds" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="DotNet.ReproducibleBuilds" PrivateAssets="All"/>
+
+    <PackageReference Include="FSharp.Core"/>
+
+    <PackageReference Include="System.Configuration.ConfigurationManager"/>
   </ItemGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/src/Argu/paket.references b/src/Argu/paket.references
diff --git a/tests/Argu.Tests/Argu.Tests.fsproj b/tests/Argu.Tests/Argu.Tests.fsproj
@@ -3,11 +3,17 @@
     <TargetFramework>net6.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <Compile Include="Tests.fs" />
-    <None Include="paket.references" />
+    <Compile Include="Tests.fs"/>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Argu\Argu.fsproj" />
+    <ProjectReference Include="..\..\src\Argu\Argu.fsproj"/>
+  </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="FSharp.Core" VersionOverride="6.0.7"/>
+
+    <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+    <PackageReference Include="Unquote"/>
+    <PackageReference Include="xunit"/>
+    <PackageReference Include="xunit.runner.visualstudio"/>
   </ItemGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
 </Project>
diff --git a/tests/Argu.Tests/paket.references b/tests/Argu.Tests/paket.references