diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 9646a0fd20..3d9abb1e4c 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -3,11 +3,11 @@ "isRoot": true, "tools": { "paket": { - "version": "9.0.0", + "version": "9.0.2", "commands": [ "paket" ], "rollForward": false } } -} +} \ No newline at end of file diff --git a/build.fsx b/build.fsx index 8f3019e425..3767669310 100644 --- a/build.fsx +++ b/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" \ No newline at end of file diff --git a/integrationtests/Paket.IntegrationTests/TestHelper.fs b/integrationtests/Paket.IntegrationTests/TestHelper.fs index 61b7181710..7a24420acd 100644 --- a/integrationtests/Paket.IntegrationTests/TestHelper.fs +++ b/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 diff --git a/paket.dependencies b/paket.dependencies index 7750836032..42584c1358 100644 --- a/paket.dependencies +++ b/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 \ No newline at end of file + github enricosada/add_icon_to_exe:e11eda501acea369ac2950beb34b8888495bf21f rh/ResourceHacker.exe \ No newline at end of file diff --git a/paket.lock b/paket.lock index 939f9b9fa3..28db5015f2 100644 --- a/paket.lock +++ b/paket.lock @@ -36,8 +36,8 @@ 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 @@ -45,7 +45,7 @@ NUGET 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)) @@ -68,18 +68,8 @@ NUGET System.ComponentModel.Primitives (>= 4.1) - restriction: >= uap10.0 System.ComponentModel.TypeConverter (>= 4.1) - restriction: >= uap10.0 System.Runtime.InteropServices.RuntimeInformation (>= 4.0) - restriction: >= uap10.0 - Microsoft.NETCore.App (2.2.8) - Microsoft.NETCore.DotNetHostPolicy (>= 2.2.8) - restriction: >= netcoreapp2.2 - Microsoft.NETCore.Platforms (>= 2.2.4) - restriction: >= netcoreapp2.2 - Microsoft.NETCore.Targets (>= 2.0) - restriction: >= netcoreapp2.2 - NETStandard.Library (>= 2.0.3) - restriction: >= netcoreapp2.2 - Microsoft.NETCore.DotNetAppHost (3.1.8) - restriction: >= netcoreapp2.2 - Microsoft.NETCore.DotNetHostPolicy (3.1.8) - restriction: >= netcoreapp2.2 - Microsoft.NETCore.DotNetHostResolver (>= 3.1.8) - Microsoft.NETCore.DotNetHostResolver (3.1.8) - restriction: >= netcoreapp2.2 - Microsoft.NETCore.DotNetAppHost (>= 3.1.8) - Microsoft.NETCore.Platforms (5.0.2) - restriction: || (&& (>= monoandroid) (>= netcoreapp2.1) (< netstandard1.3)) (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (>= net5.0) (< netstandard2.1) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (>= monotouch) (>= netcoreapp2.1)) (&& (>= net45) (< netstandard1.3)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.4)) (&& (< net46) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= net461) (>= netcoreapp2.0) (&& (>= netcoreapp2.1) (< netcoreapp3.0)) (&& (>= netcoreapp3.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp3.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8) (< win8)) (&& (< netstandard1.0) (< portable-net45+win8) (>= portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8+wp8+wpa81) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= win8)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (< win8) (>= wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0)) (>= uap10.1) (>= wp8) - Microsoft.NETCore.Targets (3.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard2.0) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< net46) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= netcoreapp2.2) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< win81) (< wpa81)) + Microsoft.NETCore.Platforms (5.0.2) - restriction: || (&& (>= monoandroid) (>= netcoreapp2.1) (< netstandard1.3)) (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (>= net5.0) (< netstandard2.1) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (>= monotouch) (>= netcoreapp2.1)) (&& (>= net45) (< netstandard1.3)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.4)) (>= net461) (&& (>= netcoreapp1.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= netcoreapp2.0) (&& (>= netcoreapp2.1) (< netcoreapp3.0)) (&& (>= netcoreapp3.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8) (< win8)) (&& (< netstandard1.0) (< portable-net45+win8) (>= portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8+wp8+wpa81) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= win8)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.3) (< win8) (>= wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= uap10.0)) (>= uap10.1) (>= wp8) + Microsoft.NETCore.Targets (3.1) - restriction: || (&& (< monoandroid) (< monotouch) (< net46) (>= netstandard1.3) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard1.4) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.2) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.3) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.4) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.5) (< win8)) (&& (< monoandroid) (< netstandard1.1) (>= netstandard1.6) (< win8)) (&& (< monotouch) (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81) (< xamarintvos) (< xamarinwatchos)) (&& (< net45) (>= net46) (< netstandard1.4)) (&& (< net45) (< netstandard1.2) (>= netstandard1.5) (< win8)) (&& (< net45) (< netstandard1.2) (>= netstandard1.6) (< win8)) (&& (< net45) (< netstandard1.3) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.3) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.4) (>= netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (< netstandard1.5) (>= netstandard1.6) (< win8) (< wpa81)) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81) (< wp8)) (&& (>= netstandard1.1) (< portable-net45+win8+wpa81)) (&& (< netstandard1.1) (>= uap10.0) (< win8)) (&& (>= netstandard1.2) (< portable-net45+win8+wpa81)) (&& (< netstandard1.2) (>= uap10.0) (< win8)) (&& (>= netstandard1.3) (< portable-net45+win8+wpa81)) (&& (< netstandard1.3) (>= uap10.0) (< win8) (< wpa81)) (&& (>= netstandard1.5) (< portable-net45+win8+wpa81)) (&& (< netstandard1.5) (>= netstandard1.6) (>= uap10.0)) (&& (< netstandard1.5) (>= uap10.0) (< uap10.1)) (&& (< netstandard1.5) (>= uap10.0) (< win8) (< wpa81)) (&& (< netstandard1.5) (>= uap10.0) (< win81) (< wpa81)) Microsoft.NETFramework.ReferenceAssemblies.net461 (1.0.3) - copy_local: true Microsoft.SourceLink.AzureRepos.Git (1.0) - copy_local: true Microsoft.Build.Tasks.Git (>= 1.0) @@ -854,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) \ No newline at end of file diff --git a/src/FSharp.DependencyManager.Paket/paket.references b/src/FSharp.DependencyManager.Paket/paket.references index 9db95a5aa3..9eca1f4f2b 100644 --- a/src/FSharp.DependencyManager.Paket/paket.references +++ b/src/FSharp.DependencyManager.Paket/paket.references @@ -1,5 +1,2 @@ DotNet.ReproducibleBuilds - -group FSharpDepManagerExtension - FSharp.Core \ No newline at end of file diff --git a/src/LockFileComparer/LockFileComparer.fsproj b/src/LockFileComparer/LockFileComparer.fsproj index 38994794ef..2b1238a041 100644 --- a/src/LockFileComparer/LockFileComparer.fsproj +++ b/src/LockFileComparer/LockFileComparer.fsproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1 + net8 false diff --git a/src/Paket.Bootstrapper/Paket.Bootstrapper.csproj b/src/Paket.Bootstrapper/Paket.Bootstrapper.csproj index 0aa96923ca..0173747abf 100644 --- a/src/Paket.Bootstrapper/Paket.Bootstrapper.csproj +++ b/src/Paket.Bootstrapper/Paket.Bootstrapper.csproj @@ -2,7 +2,7 @@ Exe - net461;netcoreapp2.1 + net461;net8 Paket.Bootstrapper.Program paket.bootstrapper paketbootstrapper diff --git a/src/Paket/Paket.fsproj b/src/Paket/Paket.fsproj index ff4bd43ce0..d6fba3e3db 100644 --- a/src/Paket/Paket.fsproj +++ b/src/Paket/Paket.fsproj @@ -2,7 +2,7 @@ Exe - net461;netcoreapp3.1 + net461;net8 Paket paket true @@ -12,7 +12,7 @@ - netcoreapp3.1 + net8 diff --git a/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj b/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj index 9376c7bec8..904e1e9c4c 100644 --- a/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj +++ b/tests/Paket.Bootstrapper.Tests/Paket.Bootstrapper.Tests.csproj @@ -2,7 +2,6 @@ Library - net8 net461;net8 true diff --git a/tests/Paket.Tests/App.config b/tests/Paket.Tests/App.config index 4bc5ff7907..d4bb870023 100644 --- a/tests/Paket.Tests/App.config +++ b/tests/Paket.Tests/App.config @@ -4,11 +4,6 @@ - - True - - - True diff --git a/tests/Paket.Tests/Paket.Tests.fsproj b/tests/Paket.Tests/Paket.Tests.fsproj index 412b599201..79e7d75c29 100644 --- a/tests/Paket.Tests/Paket.Tests.fsproj +++ b/tests/Paket.Tests/Paket.Tests.fsproj @@ -2,7 +2,7 @@ Library - net461;net6 + net461;net8 true