update FCS, allow fsdocs to roll forward to net5.0 (#621)

* roll forward to net5

* roll forward SDK

* remove global.json

* remove debug code

* debug code

* right script location

* update matrix

* update to 38.0.2

* fix build

* fix tests on 5.0

* fix tests on 5.0

* fix tests

* fix tests on 5.0

* fix tests on 5.0

Co-authored-by: Don Syme <[email protected]>

Author: dsyme

.github/workflows/pull-requests.yml

@@ -12,7 +12,7 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
-        dotnet: [3.1.302]
+        dotnet: [3.1.302, 5.0.100]
     runs-on: ${{ matrix.os }}
 
     steps:

docs/apidocs.fsx

@@ -1,6 +1,6 @@
 (*** condition: prepare ***)
 #nowarn "211"
-#I "../src/FSharp.Formatting/bin/Release/netstandard2.0"
+#I "../src/FSharp.Formatting/bin/Release/netstandard2.1"
 #r "FSharp.Formatting.Common.dll"
 #r "FSharp.Formatting.Markdown.dll"
 #r "FSharp.Formatting.CodeFormat.dll"

docs/codeformat.fsx

@@ -1,6 +1,6 @@
 (*** condition: prepare ***)
 #nowarn "211"
-#I "../src/FSharp.Formatting/bin/Release/netstandard2.0"
+#I "../src/FSharp.Formatting/bin/Release/netstandard2.1"
 #r "FSharp.Formatting.Common.dll"
 #r "FSharp.Formatting.Markdown.dll"
 #r "FSharp.Formatting.CodeFormat.dll"

docs/content.fsx

@@ -1,6 +1,6 @@
 (*** condition: prepare ***)
 #nowarn "211"
-#I "../src/FSharp.Formatting/bin/Release/netstandard2.0"
+#I "../src/FSharp.Formatting/bin/Release/netstandard2.1"
 #r "FSharp.Formatting.Common.dll"
 #r "FSharp.Formatting.Markdown.dll"
 #r "FSharp.Formatting.CodeFormat.dll"

docs/evaluation.fsx

@@ -1,6 +1,6 @@
 (*** condition: prepare ***)
 #nowarn "211"
-#I "../src/FSharp.Formatting/bin/Release/netstandard2.0"
+#I "../src/FSharp.Formatting/bin/Release/netstandard2.1"
 #r "FSharp.Formatting.Common.dll"
 #r "FSharp.Formatting.Markdown.dll"
 #r "FSharp.Formatting.CodeFormat.dll"

docs/literate.fsx

@@ -1,6 +1,6 @@
 (*** condition: prepare ***)
 #nowarn "211"
-#I "../src/FSharp.Formatting/bin/Release/netstandard2.0"
+#I "../src/FSharp.Formatting/bin/Release/netstandard2.1"
 #r "FSharp.Formatting.Common.dll"
 #r "FSharp.Formatting.Markdown.dll"
 #r "FSharp.Formatting.CodeFormat.dll"
@@ -177,7 +177,7 @@ A header may be needed to get the code to load, a typical example is this:
 
     (*** condition: prepare ***)
     #nowarn "211"
-    #I "../src/FSharp.Formatting/bin/Release/netstandard2.0"
+    #I "../src/FSharp.Formatting/bin/Release/netstandard2.1"
     #r "FSharp.Formatting.Common.dll"
     #r "FSharp.Formatting.Markdown.dll"
     #r "FSharp.Formatting.CodeFormat.dll"

docs/markdown.fsx

@@ -1,5 +1,5 @@
 (*** condition: prepare ***)
-#I "../src/FSharp.Formatting/bin/Release/netstandard2.0"
+#I "../src/FSharp.Formatting/bin/Release/netstandard2.1"
 #r "FSharp.Formatting.Common.dll"
 #r "FSharp.Formatting.Markdown.dll"
 (*** condition: fsx ***)

global.json

@@ -1,11 +1,15 @@
 version 5.249.0
 source https://api.nuget.org/v3/index.json
+source https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
 framework: auto-detect
 storage: none
 
 nuget FSharp.Core >= 4.7 lowest_matching:true
-nuget FSharp.Compiler.Service ~> 36.0
+nuget FSharp.Compiler.Service 38.0.2
 nuget CommandLineParser ~> 2.8
+nuget Microsoft.Build.Framework
+nuget Microsoft.Build.Tasks.Core
+nuget Microsoft.Build.Utilities.Core
 nuget Dotnet.ProjInfo
 nuget Dotnet.ProjInfo.Workspace
 nuget Newtonsoft.Json
@@ -31,6 +35,7 @@ group Fake
     source https://api.nuget.org/v3/index.json
     storage: none
 
+    nuget FSharp.Core ~> 4.7
     nuget Fake.Core.Target             ~> 5.20.0
     nuget Fake.Core.ReleaseNotes       ~> 5.20.0
     nuget Fake.DotNet.AssemblyInfoFile ~> 5.20.0