merge

Author: Don Syme

.config/dotnet-tools.json

@@ -3,22 +3,22 @@
   "isRoot": true,
   "tools": {
     "fsharp.formatting.commandtool": {
-      "version": "6.1.0",
+      "version": "11.4.1",
       "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

@@ -0,0 +1,28 @@
+name: Build and Publish Docs
+on:
+  push:
+    branches: [ master ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - 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: '5.0.202'
+    - name: Install tools
+      run: dotnet tool restore
+    - name: Build and Test and Docs using FAKE 
+      run: dotnet fake build
+    - name: Deploy
+      uses: peaceiris/actions-gh-pages@v3
+      with:
+        personal_token: ${{ secrets.GITHUB_TOKEN }}
+        publish_dir: ./output
+        publish_branch: gh-pages
+        force_orphan: true

.github/workflows/pull-request.yml

@@ -0,0 +1,23 @@
+name: Build and Test Pull Request
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - 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: '5.0.202'
+    - name: Install tools
+      run: dotnet tool restore
+    - 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/
 

.travis.yml

@@ -8,12 +8,10 @@
 See [the home page](http://fsprojects.github.io/FSharp.Control.AsyncSeq/) for details. The home page can be [edited, forked or cloned](https://github.com/fsprojects/FSharp.Control.AsyncSeq/tree/master/docs/content)
 Please contribute to this project. Don't ask for permission, just fork the repository and send pull requests.
 
-Please also join the [F# Open Source Group](http://fsharp.github.com)
-
 # Maintainer(s)
 
 - [@dsyme](https://github.com/dsyme)
-- [@tpetricek](https://github.com/tpetricek)
+- [@martinmoec](https://github.com/martinmoec)
 - [@eulerfx](https://github.com/eulerfx)
 
 

LICENSE.txt LICENSE.mdLICENSE.txt renamed to LICENSE.md

@@ -1,6 +1,11 @@
+### 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
 
-* bump version due to bad push
+* Include .fsi files into Fable package path [#118](https://github.com/fsprojects/FSharp.Control.AsyncSeq/pull/118)
 
 ### 3.0.1 
 

README.md

@@ -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"