Merge pull request #1516 from Thorium/fake-updated

Update tests to .NET 8

.config/dotnet-tools.json

@@ -9,13 +9,13 @@
       ]
     },
     "fake-cli": {
-      "version": "5.22.0",
+      "version": "6.1.3",
       "commands": [
         "fake"
       ]
     },
     "paket": {
-      "version": "7.1.5",
+      "version": "8.0.3",
       "commands": [
         "paket"
       ]

.github/workflows/pull-requests.yml

@@ -12,10 +12,14 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Setup .NET Core
+    - name: Setup .NET Core 6
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.203
+        dotnet-version: 6.0.425
+    - name: Setup .NET Core 8
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 8.0.400
     - name: Restore .NET local tools
       run: dotnet tool restore
     - name: Restore packages
@@ -32,10 +36,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
-    - name: Setup .NET Core
+    - name: Setup .NET Core 6
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.425
+    - name: Setup .NET Core 8
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.203
+        dotnet-version: 8.0.400
     - name: Restore .NET local tools
       run: dotnet tool restore
     - name: Restore packages

.github/workflows/push-master.yml

@@ -15,7 +15,7 @@ jobs:
     - name: Setup .NET Core
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.203
+        dotnet-version: 8.0.400
     - name: Restore .NET local tools
       run: dotnet tool restore
     - name: Restore packages

build.fsx

@@ -111,12 +111,16 @@ Target.create "CleanInternetCaches" (fun _ ->
 
 Target.create "Build" (fun _ ->
     "FSharp.Data.sln"
-    |> DotNet.build (fun o -> { o with Configuration = DotNet.BuildConfiguration.Release }))
+    |> DotNet.build (fun o ->
+        { o with
+            Configuration = DotNet.BuildConfiguration.Release
+            MSBuildParams = { o.MSBuildParams with DisableInternalBinLog = true } }))
 
 Target.create "RunTests" (fun _ ->
     let setParams (o: DotNet.TestOptions) =
         { o with
             Configuration = DotNet.BuildConfiguration.Release
+            MSBuildParams = { o.MSBuildParams with DisableInternalBinLog = true }
             Logger =
                 if isCI then
                     Some "GitHubActions"
@@ -149,7 +153,10 @@ Target.create "Pack" (fun _ ->
             { p with
                 Configuration = DotNet.BuildConfiguration.Release
                 OutputPath = Some "bin"
-                MSBuildParams = { p.MSBuildParams with Properties = properties } })
+                MSBuildParams =
+                    { p.MSBuildParams with
+                        Properties = properties
+                        DisableInternalBinLog = true } })
         "FSharp.Data.sln")
 
 // --------------------------------------------------------------------------------------

docs/data/2017_F1.htm

@@ -114,7 +114,7 @@ <h2>Contents</h2>
 <li class="toclevel-2 tocsection-4"><a href="#Mid-season_changes"><span class="tocnumber">1.3</span> <span class="toctext">Mid-season changes</span></a></li>
 </ul>
 </li>
-<li class="toclevel-1 tocsection-5"><a href="#Season_calendar"><span class="tocnumber">2</span> <span class="toctext">Season calendar</span></a>
+<li class="toclevel-1 tocsection-5"><a href="#Calendar"><span class="tocnumber">2</span> <span class="toctext">Season calendar</span></a>
 <ul>
 <li class="toclevel-2 tocsection-6"><a href="#Calendar_changes"><span class="tocnumber">2.1</span> <span class="toctext">Calendar changes</span></a></li>
 </ul>
@@ -386,7 +386,7 @@ <h3><span class="mw-headline" id="Mid-season_changes">Mid-season changes</span><
 <li>In the week before the <a href="/wiki/2017_Malaysian_Grand_Prix" title="2017 Malaysian Grand Prix">Malaysian Grand Prix</a>, <a href="/wiki/Daniil_Kvyat" title="Daniil Kvyat">Daniil Kvyat</a> was stood down by <a href="/wiki/Scuderia_Toro_Rosso" title="Scuderia Toro Rosso">Toro Rosso</a>, making way for GP2 Series champion <a href="/wiki/Pierre_Gasly" title="Pierre Gasly">Pierre Gasly</a>.<sup id="cite_ref-62" class="reference"><a href="#cite_note-62">[58]</a></sup> Kvyat will return to the team for the <a href="/wiki/2017_United_States_Grand_Prix" title="2017 United States Grand Prix">United States Grand Prix</a>.<sup id="cite_ref-63" class="reference"><a href="#cite_note-63">[59]</a></sup></li>
 <li><a href="/wiki/Carlos_Sainz_Jr." title="Carlos Sainz Jr.">Carlos Sainz Jr.</a> left Toro Rosso after the <a href="/wiki/2017_Japanese_Grand_Prix" title="2017 Japanese Grand Prix">Japanese Grand Prix</a>. He is scheduled to move to <a href="/wiki/Renault_in_Formula_One" title="Renault in Formula One">Renault</a>, where he is planned to replace <a href="/wiki/Jolyon_Palmer" title="Jolyon Palmer">Jolyon Palmer</a>.<sup id="cite_ref-RenaultSainz17_39-1" class="reference"><a href="#cite_note-RenaultSainz17-39">[35]</a></sup></li>
 </ul>
-<h2><span class="mw-headline" id="Season_calendar">Season calendar</span></h2>
+<h2><span class="mw-headline" id="Calendar">Season calendar</span></h2>
 <div class="thumb tright">
 <div class="thumbinner" style="width:292px;"><a href="/wiki/File:Formula_1_all_over_the_world-2017.svg" class="image"><img alt="" src="//upload.wikimedia.org/wikipedia/commons/thumb/f/f8/Formula_1_all_over_the_world-2017.svg/290px-Formula_1_all_over_the_world-2017.svg.png" width="290" height="128" class="thumbimage" srcset="//upload.wikimedia.org/wikipedia/commons/thumb/f/f8/Formula_1_all_over_the_world-2017.svg/435px-Formula_1_all_over_the_world-2017.svg.png 1.5x, //upload.wikimedia.org/wikipedia/commons/thumb/f/f8/Formula_1_all_over_the_world-2017.svg/580px-Formula_1_all_over_the_world-2017.svg.png 2x" data-file-width="940" data-file-height="415" /></a>
 <div class="thumbcaption">

docs/library/HtmlProvider.fsx

@@ -66,7 +66,7 @@ The `Load` method allows reading the data from a file or web resource. We could
 The following sample calls the `Load` method with an URL that points to a live version of the same page on wikipedia.
 *)
 // Download the table for the 2017 F1 calendar from Wikipedia
-let f1Calendar = F1_2017.Load(F1_2017_URL).Tables.``Season calendar``
+let f1Calendar = F1_2017.Load(F1_2017_URL).Tables.Calendar
 
 // Look at the top row, being the first race of the calendar
 let firstRow = f1Calendar.Rows |> Seq.head

global.json

@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.203",
+    "version": "8.0.400",
     "rollForward": "major"
   }
 }

paket.dependencies

@@ -1,4 +1,4 @@
-frameworks: net6.0, netstandard2.0
+frameworks: net8.0, netstandard2.0
 source https://api.nuget.org/v3/index.json
 
 # These are for TPSDK testing of TPDTCs against .NET Core App 2.0, to make sure references can be found in a known packages/... location.
@@ -20,33 +20,33 @@ group Fake
     source https://api.nuget.org/v3/index.json
     storage: none
 
-    nuget Fake.Testing.Common          5.20.3
-    nuget Fake.Net.Http                5.20.3
-    nuget Fake.IO.FileSystem           5.20.3
-    nuget Fake.Core.CommandLineParsing 5.20.3
-    nuget Fake.Core.Environment        5.20.3
-    nuget Fake.Core.FakeVar            5.20.3
-    nuget Fake.Core.SemVer             5.20.3
-    nuget Fake.Core.String             5.20.3
-    nuget Fake.Core.Context            5.20.3
-    nuget Fake.Core.Trace              5.20.3
-    nuget Fake.Core.Tasks              5.20.3
-    nuget Fake.Core.Target             5.20.3
-    nuget Fake.Core.ReleaseNotes       5.20.3
-    nuget Fake.DotNet.AssemblyInfoFile 5.20.3
-    nuget Fake.DotNet.Cli              5.20.3
-    nuget Fake.DotNet.Testing.NUnit    5.20.3
-    nuget Fake.DotNet.NuGet            5.20.3
-    nuget Fake.DotNet.MsBuild          5.20.3
-    nuget Fake.Tools.Git               5.20.3
-	nuget Fake.DotNet.Paket            5.20.3
-	nuget Microsoft.Build              16.9
-	nuget Microsoft.Build.Framework    16.9
-	nuget Microsoft.Build.Tasks.Core   16.9
-	nuget Microsoft.Build.Utilities.Core   16.9
+    nuget Fake.Testing.Common          6.1.3
+    nuget Fake.Net.Http                6.1.3
+    nuget Fake.IO.FileSystem           6.1.3
+    nuget Fake.Core.CommandLineParsing 6.1.3
+    nuget Fake.Core.Environment        6.1.3
+    nuget Fake.Core.FakeVar            6.1.3
+    nuget Fake.Core.SemVer             6.1.3
+    nuget Fake.Core.String             6.1.3
+    nuget Fake.Core.Context            6.1.3
+    nuget Fake.Core.Trace              6.1.3
+    nuget Fake.Core.Tasks              6.1.3
+    nuget Fake.Core.Target             6.1.3
+    nuget Fake.Core.ReleaseNotes       6.1.3
+    nuget Fake.DotNet.AssemblyInfoFile 6.1.3
+    nuget Fake.DotNet.Cli              6.1.3
+    nuget Fake.DotNet.Testing.NUnit    6.1.3
+    nuget Fake.DotNet.NuGet            6.1.3
+    nuget Fake.DotNet.MsBuild          6.1.3
+    nuget Fake.Tools.Git               6.1.3
+	nuget Fake.DotNet.Paket            6.1.3
+	nuget Microsoft.Build              17.11.4
+	nuget Microsoft.Build.Framework    17.11.4
+	nuget Microsoft.Build.Tasks.Core   17.11.4
+	nuget Microsoft.Build.Utilities.Core   17.11.4
 
 group Test
-    frameworks: net6.0
+    frameworks: net8.0
     source https://api.nuget.org/v3/index.json
 
     nuget FSharp.Core 6.0.1