Merge pull request fsprojects#135 from beauvankirk/master

Restore netstandard2.0 compatibility, update build environment, clean old files/lines

Author: dsyme

.config/dotnet-tools.json

@@ -3,19 +3,19 @@
   "isRoot": true,
   "tools": {
     "fsharp.formatting.commandtool": {
-      "version": "11.0.2",
+      "version": "11.1.0",
       "commands": [
         "fsdocs"
       ]
     },
     "paket": {
-      "version": "5.247.4",
+      "version": "6.0.0-rc001",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "5.20.2",
+      "version": "5.20.4",
       "commands": [
         "fake"
       ]

.github/workflows/publish.yml

@@ -1,30 +1,24 @@
 name: Build and Publish Docs
-
 on:
   push:
     branches: [ master ]
-
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Setup .NET 
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: '3.1.x'
+    - name: Setup .NET 
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '5.0.202'
     - name: Install tools
       run: dotnet tool restore
-    - name: Install dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-    - name: Test
-      run: dotnet test --no-restore --verbosity normal
-    - name: Run fsdocs
-      run: dotnet fsdocs build --properties Configuration=Release
+    - name: Build and Test and Docs using FAKE 
+      run: dotnet fake build
     - name: Deploy
       uses: peaceiris/actions-gh-pages@v3
       with:

.github/workflows/pull-request.yml

@@ -6,20 +6,18 @@ on:
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Setup .NET 
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '3.1.x'
+    - name: Setup .NET 
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.301
+        dotnet-version: '5.0.202'
     - name: Install tools
       run: dotnet tool restore
-    - name: Install dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --configuration Release --no-restore
-    - name: Test
-      run: dotnet test --no-restore --verbosity normal
+    - name: Build Test and Docs using FAKE 
+      run: dotnet fake build

.gitignore

@@ -169,6 +169,9 @@ $RECYCLE.BIN/
 # NuGet Packages Directory
 packages/
 
+# Paket files
+.paket/load/
+
 # Generated documentation folder
 docs/output/
 

RELEASE_NOTES.md

@@ -1,3 +1,8 @@
+### 3.0.4
+* Restore netstandard2.0 (and thereby .NET Framework 4.6.1+) compatibility
+* Update build env versions to current recommendations
+* Adjust to ensure all tests pass and eliminate warnings in vscode (ionide) and visual studio
+
 ### 3.0.2
 
 * Include .fsi files into Fable package path [#118](https://github.com/fsprojects/FSharp.Control.AsyncSeq/pull/118)

build.fsx

@@ -39,8 +39,6 @@ let summary = "Asynchronous sequences for F#"
 
 let license = "Apache 2.0 License"
 
-let buildDir = "bin"
-
 // Git configuration (used for publishing documentation in gh-pages branch)
 // The profile where the project is posted
 let projectRepo = "https://github.com/fsprojects/FSharp.Control.AsyncSeq"
@@ -53,11 +51,20 @@ let artifactsDir = __SOURCE_DIRECTORY__ @@ "artifacts"
 // Read additional information from the release notes document
 let release = ReleaseNotes.load "RELEASE_NOTES.md"
 
+
+let versionPropsTemplate = $"\
+<Project>
+  <PropertyGroup>
+    <Version>%s{release.NugetVersion}</Version>
+  </PropertyGroup>
+</Project>"
+
 // --------------------------------------------------------------------------------------
 // Clean build results
 
 Target.create "Clean" (fun _ ->
-    Shell.cleanDirs ["bin"; "temp"]
+    DotNet.exec id "clean" "" |> ignore
+    Shell.cleanDirs ["artifacts"; "temp"]
 )
 
 // Generate assembly info files with the right version & up-to-date information
@@ -73,7 +80,6 @@ Target.create "AssemblyInfo" (fun _ ->
 
     AssemblyInfoFile.createFSharp "src/Common/AssemblyInfo.fs" info
     AssemblyInfoFile.createCSharp "src/Common/AssemblyInfo.cs" info
-    let releaseNotes = String.toLines release.Notes |> System.Net.WebUtility.HtmlEncode
     File.WriteAllText("version.props", sprintf """<Project>
       <PropertyGroup>
         <Version>%s</Version>
@@ -107,6 +113,8 @@ Target.create "RunTests" (fun _ ->
 // Build a NuGet package
 
 Target.create "NuGet" (fun _ ->
+    
+    File.WriteAllText("version.props",versionPropsTemplate)
     DotNet.pack (fun pack ->
         { pack with
             OutputPath = Some artifactsDir 
@@ -119,7 +127,7 @@ Target.create "NuGet" (fun _ ->
 
 Target.create "GenerateDocs" (fun _ ->
     Shell.cleanDir ".fsdocs"
-    DotNet.exec id "fsdocs" "build --clean" |> ignore
+    DotNet.exec id "fsdocs" "build --clean --properties Configuration=Release" |> ignore
 )
 
 // --------------------------------------------------------------------------------------
@@ -157,10 +165,14 @@ Target.create "All" ignore
 "Clean"
   ==> "Build"
   ==> "RunTests"
-  ==> "All"
   ==> "NuGet"
-  ==> "PublishNuget"
   ==> "GenerateDocs"
+  ==> "All"
+
+"NuGet" ==> "PublishNuget"
+"GenerateDocs" ==> "ReleaseDocs"
+
+"PublishNuget"
   ==> "ReleaseDocs"
   ==> "Release"
 

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "3.1.202",
+    "version": "5.0.202",
     "rollForward": "minor"
   }
 }

paket.dependencies

@@ -1,19 +1,22 @@
+version 6.0.0-rc001
 source https://api.nuget.org/v3/index.json
-framework: netstandard2.1
+framework: netstandard2.1, netstandard2.0
 redirects: on
 storage: none
 
-nuget FSharp.Core >= 4.3.2 lowest_matching: true
+nuget FSharp.Core >= 4.3.2  lowest_matching: true
+nuget Microsoft.Bcl.AsyncInterfaces ~> 5.0.0 framework: netstandard2.0
 
 group Test
     source https://api.nuget.org/v3/index.json
-    framework: netcoreapp3.0
+    framework: netcoreapp3.1, net5.0
     storage: none
 
+    generate_load_scripts: true
+
     nuget FSharp.Core
     nuget Microsoft.NET.Test.Sdk
     nuget NUnit
-    nuget NUnit.Runners
     nuget NUnit3TestAdapter
 
 group Test.Fable
@@ -30,12 +33,12 @@ group Fake
     source https://api.nuget.org/v3/index.json
     storage: none
 
-    nuget Fake.Core.Target             ~> 5.20.0
-    nuget Fake.Core.ReleaseNotes       ~> 5.20.0
-    nuget Fake.DotNet.AssemblyInfoFile ~> 5.20.0
-    nuget Fake.DotNet.Cli              ~> 5.20.0
-    nuget Fake.DotNet.Testing.NUnit    ~> 5.20.0
-    nuget Fake.DotNet.NuGet            ~> 5.20.0
-    nuget Fake.DotNet.MsBuild          ~> 5.20.0
-    nuget Fake.Tools.Git               ~> 5.20.0
-	nuget Fake.DotNet.Paket            ~> 5.20.0
+    nuget Fake.Core.Target             ~> 5.20.4
+    nuget Fake.Core.ReleaseNotes       ~> 5.20.4
+    nuget Fake.DotNet.AssemblyInfoFile ~> 5.20.4
+    nuget Fake.DotNet.Cli              ~> 5.20.4
+    nuget Fake.DotNet.Testing.NUnit    ~> 5.20.4
+    nuget Fake.DotNet.NuGet            ~> 5.20.4
+    nuget Fake.DotNet.MsBuild          ~> 5.20.4
+    nuget Fake.Tools.Git               ~> 5.20.4
+	nuget Fake.DotNet.Paket            ~> 5.20.4