Update to netcoreapp3.1 and netstandard2.1

Author: forki

build.fsx

@@ -72,10 +72,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"
@@ -222,7 +222,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
         })
@@ -237,7 +237,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
         })

integrationtests/Paket.IntegrationTests/FsiExtension.fs

@@ -13,7 +13,7 @@ module FsiExtension =
       "Release"
     #endif
 
-    let pathToExtension = Path.Combine(__SOURCE_DIRECTORY__, "..", "..", "src", "FSharp.DependencyManager.Paket", "bin", configuration, "netstandard2.0")
+    let pathToExtension = Path.Combine(__SOURCE_DIRECTORY__, "..", "..", "src", "FSharp.DependencyManager.Paket", "bin", configuration, "netstandard2.1")
     let extensionFileName = "FSharp.DependencyManager.Paket.dll"
 
     [<Test>]
@@ -25,18 +25,19 @@ 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) ->
@@ -68,7 +69,7 @@ module FsiExtension =
             p.WaitForExit()
             standardOutput, errorOutput
         { file = fsxFile; stdOut = standardOutput; errOut = errorOutput; arguments = arguments }
-        
+
     let runSingleFsxTest (fsxFile: FileInfo) =
 
         let expectedOutput =
@@ -79,7 +80,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>"))
@@ -90,25 +91,24 @@ 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)

src/FSharp.DependencyManager.Paket/FSharp.DependencyManager.Paket.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>netstandard2.1</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

src/LockFileComparer/LockFileComparer.fsproj

@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Program.fs" />

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;netcoreapp3.1</TargetFrameworks>
     <StartupObject>Paket.Bootstrapper.Program</StartupObject>
     <AssemblyName>paket.bootstrapper</AssemblyName>
     <ToolCommandName>paketbootstrapper</ToolCommandName>
@@ -16,7 +16,7 @@
 
   <PropertyGroup Condition=" '$(PackAsTool)' == 'true'">
     <TargetFrameworks></TargetFrameworks>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Condition=" '$(PackAsTool)' == 'true'">

src/Paket.Core/Common/Utils.fs

@@ -780,7 +780,7 @@ module ObservableExtensions =
               member __.Subscribe observer =
                 let rm = e.Subscribe observer in f(); rm }
 
-        let sample milliseconds source =
+        let sample (milliseconds:int) source =
             let relay (observer:IObserver<'T>) =
                 let rec loop () = async {
                     let! value = Async.AwaitObservable source

src/Paket.Core/Paket.Core.fsproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.1</TargetFrameworks>
     <AutoGenerateBindingRedirects Condition=" '$(TargetFramework)' == 'net461' ">true</AutoGenerateBindingRedirects>
     <Version Condition="'$(PAKET_PROJ_VERSION)' != ''">$(PAKET_PROJ_VERSION)</Version>
     <PackageVersion Condition="'$(PAKET_PROJ_VERSION)' != ''">$(PAKET_PROJ_VERSION)</PackageVersion>

src/Paket/Paket.fsproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;netcoreapp2.1</TargetFrameworks>
+    <TargetFrameworks>net461;netcoreapp3.1</TargetFrameworks>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <PackageId>Paket</PackageId>
     <AssemblyName>paket</AssemblyName>
@@ -14,7 +14,7 @@
   <PropertyGroup Condition=" '$(PackAsTool)' == 'true' ">
     <!-- .net tools support netcoreapp only -->
     <TargetFrameworks></TargetFrameworks>
-    <TargetFramework>netcoreapp2.1</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />