Merge pull request #4288 from 1eyewonder/dotnet-update

Re-add Changes Lost From #4272

Author: forki

.config/dotnet-tools.json

@@ -3,11 +3,11 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "9.0.0",
+      "version": "9.0.2",
       "commands": [
         "paket"
       ],
       "rollForward": false
     }
   }
-}
+}

build.fsx

@@ -67,10 +67,10 @@ let mutable dotnetExePath = "dotnet"
 
 let buildDir = "bin"
 let buildDirNet461 = buildDir @@ "net461"
-let buildDirNetCore = buildDir @@ "netcoreapp3.1"
+let buildDirNetCore = buildDir @@ "net8"
 let buildDirBootstrapper = "bin_bootstrapper"
 let buildDirBootstrapperNet461 = buildDirBootstrapper @@ "net461"
-let buildDirBootstrapperNetCore = buildDirBootstrapper @@ "netcoreapp2.1"
+let buildDirBootstrapperNetCore = buildDirBootstrapper @@ "net8"
 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 = "netcoreapp3.1"
+            Framework = "net8"
             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 = "net8"
             Output = FullName (currentDirectory </> buildDirBootstrapperNetCore)
             ToolPath = dotnetExePath
             AdditionalArgs = publishArgs
@@ -355,7 +355,7 @@ Target "RunIntegrationTestsNetCore" (fun _ ->
     DotNetCli.Test (fun c ->
         { c with
             Project = "integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj"
-            Framework = "netcoreapp3.1"
+            Framework = "net8"
             AdditionalArgs =
               [ "--filter"; (if testSuiteFilterFlakyTests then "TestCategory=Flaky" else "TestCategory!=Flaky")
                 sprintf "--logger:trx;LogFileName=%s" ("tests_result/netcore/Paket.IntegrationTests/TestResult.trx" |> Path.GetFullPath) ]
@@ -728,4 +728,4 @@ Target "All" DoNothing
 "EnsurePackageSigned"
   ==> "Release"
 
-RunTargetOrDefault "All"
+RunTargetOrDefault "All"

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/net8/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/net8/paket.bootstrapper.dll")
 #else
     "", FullName(__SOURCE_DIRECTORY__ + "../../../bin_bootstrapper/net461/paket.bootstrapper.exe")
 #endif

paket.dependencies

@@ -5,14 +5,13 @@ content: none
 
 nuget Newtonsoft.Json >= 10.0.3 redirects: force
 nuget Argu >= 5.1.0
-nuget FSharp.Core >= 6.0.3 redirects: force
+nuget FSharp.Core >= 6.0.3
 nuget Chessie >= 0.6
 nuget Mono.Cecil ~> 0.11.1
 
 nuget System.Security.Cryptography.ProtectedData >= 4.4
 
 nuget NETStandard.Library ~> 2.0
-nuget Microsoft.NETCore.App ~> 2.1
 nuget System.Net.Http.WinHttpHandler >= 4.5
 nuget Nuget.Packaging
 nuget Microsoft.Win32.Registry
@@ -56,8 +55,4 @@ group Build
   nuget 0x53A.ReferenceAssemblies.Paket 0.2.0
 
   # add icon to exe
-  github enricosada/add_icon_to_exe:e11eda501acea369ac2950beb34b8888495bf21f rh/ResourceHacker.exe
-
-group FSharpDepManagerExtension
-  source https://api.nuget.org/v3/index.json
-  nuget FSharp.Core = 5.0.0 redirects: force
+  github enricosada/add_icon_to_exe:e11eda501acea369ac2950beb34b8888495bf21f rh/ResourceHacker.exe

paket.lock

@@ -36,16 +36,16 @@ NUGET
     FsCheck (2.15.3)
       FSharp.Core (>= 4.0.0.1) - restriction: && (< net452) (>= netstandard1.0) (< netstandard1.6)
       FSharp.Core (>= 4.2.3) - restriction: || (>= net452) (>= netstandard1.6)
-    FSharp.Compiler.Service (43.8.400)
-      FSharp.Core (8.0.400) - restriction: >= netstandard2.0
+    FSharp.Compiler.Service (43.9.101)
+      FSharp.Core (9.0.101) - restriction: >= netstandard2.0
       System.Buffers (>= 4.5.1) - restriction: >= netstandard2.0
       System.Collections.Immutable (>= 8.0) - restriction: >= netstandard2.0
       System.Diagnostics.DiagnosticSource (>= 8.0) - restriction: >= netstandard2.0
       System.Memory (>= 4.5.5) - restriction: >= netstandard2.0
       System.Reflection.Emit (>= 4.7) - restriction: >= netstandard2.0
       System.Reflection.Metadata (>= 8.0) - restriction: >= netstandard2.0
       System.Runtime.CompilerServices.Unsafe (>= 6.0) - restriction: >= netstandard2.0
-    FSharp.Core (8.0.400)
+    FSharp.Core (9.0.101)
     Microsoft.Build.Tasks.Git (1.0) - copy_local: true
     Microsoft.CodeCoverage (16.7.1) - restriction: || (>= net45) (>= netcoreapp1.0)
     Microsoft.CSharp (4.7) - redirects: force, restriction: || (&& (< net20) (>= netstandard1.0) (< netstandard1.3)) (&& (< net20) (>= netstandard1.3) (< netstandard2.0))
@@ -844,8 +844,4 @@ GITHUB
     modules/Octokit/Octokit.fsx (13eee5a7b990fa310813f9760094aa3cfebeb33f)
       Octokit (>= 0.20)
   remote: enricosada/add_icon_to_exe
-    rh/ResourceHacker.exe (e11eda501acea369ac2950beb34b8888495bf21f)
-GROUP FSharpDepManagerExtension
-NUGET
-  remote: https://api.nuget.org/v3/index.json
-    FSharp.Core (5.0) - redirects: force
+    rh/ResourceHacker.exe (e11eda501acea369ac2950beb34b8888495bf21f)

src/FSharp.DependencyManager.Paket/paket.references

@@ -1,5 +1,2 @@
 DotNet.ReproducibleBuilds
-
-group FSharpDepManagerExtension
-
 FSharp.Core

src/LockFileComparer/LockFileComparer.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
   <ItemGroup>

src/Paket.Bootstrapper/Paket.Bootstrapper.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net461;net8</TargetFrameworks>
     <StartupObject>Paket.Bootstrapper.Program</StartupObject>
     <AssemblyName>paket.bootstrapper</AssemblyName>
     <ToolCommandName>paketbootstrapper</ToolCommandName>

src/Paket/Paket.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
+    <TargetFrameworks>net461;net8</TargetFrameworks>
     <PackageId>Paket</PackageId>
     <AssemblyName>paket</AssemblyName>
     <IsPackable>true</IsPackable>
@@ -12,7 +12,7 @@
     <!-- .net tools support netcoreapp only -->
     <TargetFrameworks>
     </TargetFrameworks>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net8</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <None Include="../../README.md" Pack="true" PackagePath="\" />

tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj

@@ -2,7 +2,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net8</TargetFrameworks>
     <TargetFrameworks>net461;net8</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>