Update to FCS 38 (currently nightly releases) (#468)

* code changes necessary for fcs 38

* bump to net5.0 to fix deep bug in FCS

* add some logging to the tests to figure out the new issue

* bump github actions SDK versions

* add 3.1 sdk to the build environments for dotnet-tools

* use FCS 38 stable now

* revert the async/sync changes in FCS 38 that were not part of the SDK drop

* change build script to allow specifying arguments

* add release note

* tweak build script to make prerelease versions for unreleased changes

* correct the version bump logic to account for SemVerInfos interesting normalization

* Make use of keepAssemblyContents

* Don't use sdk refs outside of framework

Co-authored-by: Matt Mcveigh <[email protected]>

.config/dotnet-tools.json

@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "fake-cli": {
-      "version": "5.19.1",
+      "version": "5.20.4-alpha.1642",
       "commands": [
         "fake"
       ]
     },
     "paket": {
-      "version": "5.243.0",
+      "version": "5.252.0",
       "commands": [
         "paket"
       ]
@@ -27,4 +27,4 @@
       ]
     }
   }
-}
+}

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: .NET Core 3.1
+name: .NET 5.0
 
 on: [push, pull_request]
 
@@ -8,12 +8,16 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        dotnet: [3.1.200]
+        dotnet: [5.0.100]
     runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v1
-    - name: Setup .NET Core
+    - name: Setup .Net Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '3.1.x'
+    - name: Setup .NET 5
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: ${{ matrix.dotnet }}

.github/workflows/docs.yml

@@ -11,15 +11,19 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        dotnet: [3.1.200]
+        dotnet: [5.0.100]
     runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Setup .Net Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 3.1.200
+        dotnet-version: '3.1.x'
+    - name: Setup .NET 5
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.100
     - name: Restore tools
       run: dotnet tool restore
     - name: Restore dependencies

.github/workflows/publish.yml

@@ -11,12 +11,16 @@ jobs:
     strategy:
       matrix:
         os: [windows-latest]
-        dotnet: [3.1.200]
+        dotnet: [5.0.100]
     runs-on: ${{ matrix.os }}
 
     steps:
     - uses: actions/checkout@v1
-    - name: Setup .NET Core
+    - name: Setup .Net Core
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: '3.1.x'
+    - name: Setup .NET 5
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: ${{ matrix.dotnet }}

CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+- Update to FCS 38
+- Update to .Net 5
 
 ## [0.16.5] - 2020-06-26
 - Update navigation in docs.

build.fsx

@@ -13,6 +13,8 @@ open Fake.IO.Globbing.Operators
 open Fake.Core.TargetOperators
 open Fake.Api
 
+Target.initEnvironment()
+
 // --------------------------------------------------------------------------------------
 // Information about the project to be used at NuGet and in AssemblyInfo files
 // --------------------------------------------------------------------------------------
@@ -37,14 +39,20 @@ let nugetDir  = "./out/"
 System.Environment.CurrentDirectory <- __SOURCE_DIRECTORY__
 let changelogFilename = "CHANGELOG.md"
 let changelog = Changelog.load changelogFilename
-let latestEntry = changelog.LatestEntry
-
-let nugetVersion = latestEntry.NuGetVersion
-let packageReleaseNotes = sprintf "%s/blob/v%s/CHANGELOG.md" gitUrl latestEntry.NuGetVersion
-let releaseNotes =
-    latestEntry.Changes
-    |> List.map (fun c -> " * " + c.ToString())
-    |> String.concat "\n"
+let nugetVersion =
+    match changelog.Unreleased with
+    | None ->
+        changelog.LatestEntry.NuGetVersion
+    | Some _unreleased ->
+        let current = changelog.LatestEntry.NuGetVersion |> SemVer.parse
+        let bumped = { current with
+                            Minor = current.Minor + 1u
+                            Patch = 0u
+                            Original = None
+                            PreRelease = PreRelease.TryParse "alpha01" }
+        string bumped
+
+let packageReleaseNotes = sprintf "%s/blob/v%s/CHANGELOG.md" gitUrl nugetVersion
 
 // --------------------------------------------------------------------------------------
 // Helpers
@@ -149,4 +157,4 @@ Target.create "Release" DoNothing
   ==> "Push"
   ==> "Release"
 
-Target.runOrDefault "Default"
+Target.runOrDefaultWithArguments "Default"

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "3.1.200"
+    "version": "5.0.100"
   }
 }

paket.dependencies

@@ -1,20 +1,21 @@
 source https://api.nuget.org/v3/index.json
-framework: netstandard2.0, netcoreapp3.1, netcoreapp2.1
+
+framework: netstandard2.0, net5.0
 storage: none
 
 nuget Argu
 nuget BenchmarkDotNet
 nuget BenchmarkDotNet.Diagnostics.Windows
 nuget FParsec
-nuget FSharp.Compiler.Service ~> 36.0
+nuget FSharp.Compiler.Service ~> 38.0
 nuget Dotnet.ProjInfo.Workspace ~> 0.41.0
 nuget Dotnet.ProjInfo.Workspace.FCS ~> 0.41.0
-nuget FSharp.Core ~> 4.6.2
+nuget FSharp.Core
 nuget nunit
 nuget NUnit3TestAdapter
 nuget Microsoft.NET.Test.Sdk
 nuget Newtonsoft.Json
-
+nuget Microsoft.Build.Utilities.Core 16.7
 
 group Docs
   source https://api.nuget.org/v3/index.json