Sunset Chessie and Migrate to FsToolkit.ErrorHandling

.vscode/settings.json

@@ -4,5 +4,6 @@
         "paket-files",
         "integrationtests/scenarios",
         "packages"
-    ]
+    ],
+    "editor.inlayHints.enabled": "offUnlessPressed"
 }

build.fsx

@@ -67,10 +67,10 @@ let mutable dotnetExePath = "dotnet"
 
 let buildDir = "bin"
 let buildDirNet461 = buildDir @@ "net461"
-let buildDirNetCore = buildDir @@ "netcoreapp2.1"
+let buildDirNetCore = buildDir @@ "netcoreapp3.1"
 let buildDirBootstrapper = "bin_bootstrapper"
 let buildDirBootstrapperNet461 = buildDirBootstrapper @@ "net461"
-let buildDirBootstrapperNetCore = buildDirBootstrapper @@ "netcoreapp2.1"
+let buildDirBootstrapperNetCore = buildDirBootstrapper @@ "netcoreapp3.1"
 let tempDir = "temp"
 let buildMergedDir = buildDir @@ "merged"
 let paketFile = buildMergedDir @@ "paket.exe"
@@ -199,7 +199,7 @@ Target "Publish" (fun _ ->
     DotNetCli.Publish (fun c ->
         { c with
             Project = "src/Paket"
-            Framework = "netcoreapp2.1"
+            Framework = "netcoreapp3.1"
             Output = FullName (currentDirectory </> buildDirNetCore)
             ToolPath = dotnetExePath
             AdditionalArgs = publishArgs
@@ -217,7 +217,7 @@ Target "Publish" (fun _ ->
     DotNetCli.Publish (fun c ->
         { c with
             Project = "src/Paket.Bootstrapper"
-            Framework = "netcoreapp2.1"
+            Framework = "netcoreapp3.1"
             Output = FullName (currentDirectory </> buildDirBootstrapperNetCore)
             ToolPath = dotnetExePath
             AdditionalArgs = publishArgs
@@ -248,10 +248,10 @@ Target "RunTests" (fun _ ->
             })
 
     runTest "net" "Paket.Tests" "net461"
-    runTest "netcore" "Paket.Tests" "netcoreapp3.0"
+    runTest "netcore" "Paket.Tests" "netcoreapp3.1"
 
     runTest "net" "Paket.Bootstrapper.Tests" "net461"
-    runTest "netcore" "Paket.Bootstrapper.Tests" "netcoreapp3.0"
+    runTest "netcore" "Paket.Bootstrapper.Tests" "netcoreapp3.1"
 )
 
 Target "QuickTest" (fun _ ->
@@ -292,7 +292,7 @@ Target "MergePaketTool" (fun _ ->
     let mergeLibs =
         [
             "Argu.dll"
-            "Chessie.dll"
+            "FsToolkit.ErrorHandling.dll"
             "Fake.Core.ReleaseNotes.dll"
             "FSharp.Core.dll"
             "Mono.Cecil.dll"

integrationtests/Paket.IntegrationTests/App.config

@@ -7,7 +7,7 @@
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="6.0.0.0" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="8.0.0.0" />
   </dependentAssembly>
   <dependentAssembly>
     <Paket>True</Paket>

integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj

@@ -15,7 +15,6 @@
     <Compile Include="NugetDownloadSpecs.fs" />
     <Compile Include="InitSpecs.fs" />
     <Compile Include="InfoSpecs.fs" />
-    <Compile Include="OutdatedSpecs.fs" />
     <Compile Include="NuGetV3Specs.fs" />
     <Compile Include="UpdatePackageSpecs.fs" />
     <Compile Include="UpdateGroupsSpecs.fs" />

integrationtests/Paket.IntegrationTests/PaketCoreSpecs.fs

@@ -8,7 +8,7 @@ open System
 open System.IO
 open System.Diagnostics
 open Paket
-open Chessie.ErrorHandling
+open FsToolkit.ErrorHandling
 open Paket.Domain 
 
 let alternativeProjectRoot = None

integrationtests/Paket.IntegrationTests/TestHelper.fs

@@ -21,14 +21,14 @@ let dotnetToolPath =
 
 let paketToolPath =
 #if PAKET_NETCORE
-    dotnetToolPath, FullName(__SOURCE_DIRECTORY__ + "../../../bin/netcoreapp2.1/paket.dll")
+    dotnetToolPath, FullName(__SOURCE_DIRECTORY__ + "../../../bin/netcoreapp3.1/paket.dll")
 #else
     "", FullName(__SOURCE_DIRECTORY__ + "../../../bin/net461/paket.exe")
 #endif
 
 let paketBootstrapperToolPath =
 #if PAKET_NETCORE
-    dotnetToolPath, FullName(__SOURCE_DIRECTORY__ + "../../../bin_bootstrapper/netcoreapp2.1/paket.bootstrapper.dll")
+    dotnetToolPath, FullName(__SOURCE_DIRECTORY__ + "../../../bin_bootstrapper/netcoreapp3.1/paket.bootstrapper.dll")
 #else
     "", FullName(__SOURCE_DIRECTORY__ + "../../../bin_bootstrapper/net461/paket.bootstrapper.exe")
 #endif

integrationtests/Paket.IntegrationTests/paket.references

@@ -1,8 +1,9 @@
-FSharp.Core
-FSharp.Compiler.Service
-Chessie
 Newtonsoft.Json
 Microsoft.NET.Test.Sdk
 NUnit
 NUnit3TestAdapter
-File:FsUnit.fs .
+File:FsUnit.fs .
+
+group IntegrationTests
+    FSharp.Core
+    FSharp.Compiler.Service

paket.dependencies

@@ -3,13 +3,14 @@ source https://api.nuget.org/v3/index.json
 storage: none
 content: none
 
+nuget FsToolkit.ErrorHandling > 4
 nuget Newtonsoft.Json >= 10.0.3 redirects: force
 nuget Argu >= 5.1.0
-nuget FSharp.Core = 6.0.3 redirects: force
-nuget Chessie >= 0.6
+nuget FSharp.Core >= 6.0.3 redirects: force
 nuget Mono.Cecil ~> 0.11.1
 
 nuget System.Security.Cryptography.ProtectedData >= 4.4
+nuget System.Security.Permissions >= 6
 
 nuget NETStandard.Library ~> 2.0
 nuget Microsoft.NETCore.App ~> 2.1
@@ -60,4 +61,10 @@ group Build
 
 group FSharpDepManagerExtension
   source https://api.nuget.org/v3/index.json
-  nuget FSharp.Core = 5.0.0 redirects: force
+  nuget FSharp.Core = 5.0.0 redirects: force
+
+# Temporary until the integration code is updated to use the latest FSharp.Compiler.Service
+group IntegrationTests
+  source https://api.nuget.org/v3/index.json
+  nuget FSharp.Core
+  nuget FSharp.Compiler.Service ~> 38.0.2