Bump version to 9.0.1

build.fsx

@@ -67,10 +67,10 @@ let mutable dotnetExePath = "dotnet"
 
 let buildDir = "bin"
 let buildDirNet461 = buildDir @@ "net461"
-let buildDirNet = buildDir @@ "net8"
+let buildDirNetCore = buildDir @@ "netcoreapp3.1"
 let buildDirBootstrapper = "bin_bootstrapper"
 let buildDirBootstrapperNet461 = buildDirBootstrapper @@ "net461"
-let buildDirBootstrapperNet = buildDirBootstrapper @@ "net8"
+let buildDirBootstrapperNetCore = buildDirBootstrapper @@ "netcoreapp2.1"
 let tempDir = "temp"
 let buildMergedDir = buildDir @@ "merged"
 let paketFile = buildMergedDir @@ "paket.exe"
@@ -116,10 +116,10 @@ Target "Clean" (fun _ ->
     ++ "tests/**/bin"
     ++ buildDir
     ++ buildDirNet461
-    ++ buildDirNet
+    ++ buildDirNetCore
     ++ buildDirBootstrapper
     ++ buildDirBootstrapperNet461
-    ++ buildDirBootstrapperNet
+    ++ buildDirBootstrapperNetCore
     ++ tempDir
     |> CleanDirs
 
@@ -199,8 +199,8 @@ Target "Publish" (fun _ ->
     DotNetCli.Publish (fun c ->
         { c with
             Project = "src/Paket"
-            Framework = "net8"
-            Output = FullName (currentDirectory </> buildDirNet)
+            Framework = "netcoreapp3.1"
+            Output = FullName (currentDirectory </> buildDirNetCore)
             ToolPath = dotnetExePath
             AdditionalArgs = publishArgs
         })
@@ -217,8 +217,8 @@ Target "Publish" (fun _ ->
     DotNetCli.Publish (fun c ->
         { c with
             Project = "src/Paket.Bootstrapper"
-            Framework = "net8"
-            Output = FullName (currentDirectory </> buildDirBootstrapperNet)
+            Framework = "netcoreapp2.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" "net8"
+    runTest "netcore" "Paket.Tests" "netcoreapp3.0"
 
     runTest "net" "Paket.Bootstrapper.Tests" "net461"
-    runTest "netcore" "Paket.Bootstrapper.Tests" "net8"
+    runTest "netcore" "Paket.Bootstrapper.Tests" "netcoreapp3.0"
 )
 
 Target "QuickTest" (fun _ ->
@@ -355,7 +355,7 @@ Target "RunIntegrationTestsNetCore" (fun _ ->
     DotNetCli.Test (fun c ->
         { c with
             Project = "integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj"
-            Framework = "net8"
+            Framework = "netcoreapp3.1"
             AdditionalArgs =
               [ "--filter"; (if testSuiteFilterFlakyTests then "TestCategory=Flaky" else "TestCategory!=Flaky")
                 sprintf "--logger:trx;LogFileName=%s" ("tests_result/netcore/Paket.IntegrationTests/TestResult.trx" |> Path.GetFullPath) ]

integrationtests/Paket.IntegrationTests/App.config

@@ -2,7 +2,6 @@
 <configuration>
   <runtime>
     <AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
-
 
   <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>

integrationtests/Paket.IntegrationTests/FsiExtension.fs

@@ -25,18 +25,18 @@ module FsiExtension =
               printfn "binding redirect for FSharp.Core..."
               typedefof<Map<_,_>>.Assembly
           else
-              e.RequestingAssembly  
+              e.RequestingAssembly
       )
       let checker = FSharpChecker.Create(suggestNamesForErrors=true, keepAssemblyContents=true)
       let sourceText = """
       #r "paket: nuget FSharp.Data"
       let v = FSharp.Data.JsonValue.Boolean true
       """
-      let projectOptions = 
+      let projectOptions =
         checker.GetProjectOptionsFromScript("test.fsx", SourceText.ofString sourceText, otherFlags = [| "/langversion:preview"; sprintf "/compilertool:%s" pathToExtension |] )
         |> Async.RunSynchronously
         |> fst
-      
+
       let _, answer = checker.ParseAndCheckFileInProject("test.fsx", 0, SourceText.ofString sourceText, projectOptions) |> Async.RunSynchronously
       match answer with
       | FSharpCheckFileAnswer.Succeeded(result) ->
@@ -67,7 +67,7 @@ module FsiExtension =
             p.WaitForExit()
             standardOutput, errorOutput
         { file = fsxFile; stdOut = standardOutput; errOut = errorOutput; arguments = arguments }
-        
+
     let runSingleFsxTest (fsxFile: FileInfo) =
 
         let expectedOutput =
@@ -78,7 +78,7 @@ module FsiExtension =
                 File.Create goldenFile |> ignore
                 ""
         let result = runSingleFsxTestForOutput fsxFile
-        
+
         let actualOutput =
             (result.stdOut + result.errOut).Split([|System.Environment.NewLine|], System.StringSplitOptions.None)
             |> Array.filter (fun s -> not (s.StartsWith ":paket>"))
@@ -89,25 +89,25 @@ module FsiExtension =
         let actualOutput = normalizeCR actualOutput
         let expectedOutput = normalizeCR expectedOutput
         if actualOutput = expectedOutput then
-            Pass fsxFile.FullName 
-        else 
+            Pass fsxFile.FullName
+        else
             Failed(fsxFile.FullName, expectedOutput, actualOutput, result.arguments)
 
     [<Test>]
     let ``run fsi integration tests that have deterministic output`` () =
         let fsxFiles = DirectoryInfo(fsxsFolder).GetFiles("*.fsx", SearchOption.AllDirectories)
-        let failures = 
+        let failures =
             [|
                 for fsx in fsxFiles do
                     if not (fsx.Name.StartsWith "skip.") then
-                        
+
                         match runSingleFsxTest fsx with
                         | Pass _ -> printfn "OK: %s" fsx.FullName
                         | Failed(file,_,_,commandArguments) ->
                             printfn "KO: %s" fsx.FullName
                             yield file, commandArguments
             |]
-        
+
         if failures.Length > 0 then
             failures
             |> Array.map (fun (fsxFile, arguments) -> sprintf "file: %s\ncommand: %s" fsxFile arguments)

integrationtests/Paket.IntegrationTests/Paket.IntegrationTests.fsproj

@@ -15,11 +15,11 @@
     <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" />
     <Compile Include="AddSpecs.fs" />
+    <Compile Include="OutdatedSpecs.fs" />
     <Compile Include="PackSpecs.fs" />
     <Compile Include="InstallSpecs.fs" />
     <Compile Include="RestoreSpecs.fs" />

integrationtests/Paket.IntegrationTests/TestHelper.fs

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

paket.dependencies

@@ -5,13 +5,14 @@ content: none
 
 nuget Newtonsoft.Json >= 10.0.3 redirects: force
 nuget Argu >= 5.1.0
-nuget FSharp.Core >= 6.0.3
+nuget FSharp.Core >= 6.0.3 redirects: force
 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,3 +57,7 @@ group Build
 
   # 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

paket.lock

@@ -854,4 +854,8 @@ GITHUB
     modules/Octokit/Octokit.fsx (13eee5a7b990fa310813f9760094aa3cfebeb33f)
       Octokit (>= 0.20)
   remote: enricosada/add_icon_to_exe
-    rh/ResourceHacker.exe (e11eda501acea369ac2950beb34b8888495bf21f)
+    rh/ResourceHacker.exe (e11eda501acea369ac2950beb34b8888495bf21f)
+GROUP FSharpDepManagerExtension
+NUGET
+  remote: https://api.nuget.org/v3/index.json
+    FSharp.Core (5.0) - redirects: force

src/FSharp.DependencyManager.Paket/paket.references

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

src/Paket.Bootstrapper/Paket.Bootstrapper.csproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;net8</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
     <StartupObject>Paket.Bootstrapper.Program</StartupObject>
     <AssemblyName>paket.bootstrapper</AssemblyName>
     <ToolCommandName>paketbootstrapper</ToolCommandName>
@@ -15,7 +15,8 @@
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(PackAsTool)' == 'true'">
-    <TargetFramework>net8</TargetFramework>
+    <TargetFrameworks></TargetFrameworks>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(PackAsTool)' == 'true'">

src/Paket.Core/app.config

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-
 <runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>
     <Paket>True</Paket>

src/Paket/App.config

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-
+  
   <startup>
     <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
   </startup>
-
 <runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>
     <Paket>True</Paket>

src/Paket/Paket.fsproj

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

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

@@ -3,6 +3,7 @@
   <PropertyGroup>
     <OutputType>Library</OutputType>
     <TargetFrameworks>net8</TargetFrameworks>
+    <TargetFrameworks>net461;net8</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>

tests/Paket.Bootstrapper.Tests/app.config

@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-  </startup>
-
-<runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" /></startup><runtime><assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

tests/Paket.Tests/App.config

@@ -2,9 +2,13 @@
 <configuration>
   <runtime>
     <AppContextSwitchOverrides value="Switch.System.IO.UseLegacyPathHandling=false;Switch.System.IO.BlockLongPaths=false" />
-
 
   <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+  <dependentAssembly>
+    <Paket>True</Paket>
+    <assemblyIdentity name="FSharp.Core" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+    <bindingRedirect oldVersion="0.0.0.0-65535.65535.65535.65535" newVersion="5.0.0.0" />
+  </dependentAssembly>
   <dependentAssembly>
     <Paket>True</Paket>
     <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />

tests/Paket.Tests/Paket.Tests.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks>net461;net8</TargetFrameworks>
+    <TargetFrameworks>net461;net6</TargetFrameworks>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <!-- these two properties are set for some tests around assembly metadata parsing.
          they're written to the generated AssemblyInfo.fs -->