Merge pull request #877 from nojaf/bump-sdk-8-0-100

Bump sdk 8 0 100
fsprojects · Nov 21, 2023 · 0ffc760 · 0ffc760
2 parents 53a00e2 + f227ada
commit 0ffc760
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 66 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "fantomas": {
-      "version": "6.2.3",
+      "version": "6.3.0-alpha-003",
       "commands": [
         "fantomas"
       ]

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,5 +1,10 @@
 version: 2
 updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"
+
   - package-ecosystem: nuget
     directory: "/"
     schedule:

diff --git a/.github/workflows/modern-theme.yml b/.github/workflows/modern-theme.yml
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -2,7 +2,7 @@
 ## Building and Development
 
 - Clone the repository
-- Build with `build.cmd` or `build.sh`
+- Build with `dotnet build`
 - Open `FSharp.Formatting.sln` with Visual Studio or Visual Studio Code (with the ionide-fsharp extension)
 
 ## Source Formatting

diff --git a/FSharp.Formatting.sln b/FSharp.Formatting.sln
@@ -8,9 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{194B
 		.dockerignore = .dockerignore
 		.editorconfig = .editorconfig
 		.gitignore = .gitignore
-		build.cmd = build.cmd
 		build.fsx = build.fsx
-		build.sh = build.sh
 		Directory.Build.props = Directory.Build.props
 		docker-build.sh = docker-build.sh
 		Dockerfile = Dockerfile

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## [Unreleased]
+## 20.0.0-alpha-013 - 2023-11-21
 
 ### Added
 * Add more options to customize colors.
@@ -9,6 +9,9 @@
 - `--fsdocs-theme-toggle-light-color` and `--fsdocs-theme-toggle-dark-color` are now deprecated. Use `--header-link-color` instead.
 - `<FsDocsCollectionNameLink>`
 
+### Changed
+- Update FCS to 43.8.100
+
 ## 20.0.0-alpha-012 - 2023-11-17
 
 ### Added

diff --git a/build.fsx b/build.fsx
@@ -47,7 +47,7 @@ let lintStage =
 let testStage =
     stage "Tests" {
         run
-            $"dotnet test {solutionFile} --configuration {configuration} --no-build --blame --logger trx --framework net7.0 --results-directory TestResults"
+            $"dotnet test {solutionFile} --configuration {configuration} --no-build --blame --logger trx --results-directory TestResults -tl"
     }
 
 pipeline "CI" {
@@ -61,11 +61,11 @@ pipeline "CI" {
     }
 
     stage "Build" {
-        run $"dotnet restore {solutionFile}"
-        run $"dotnet build {solutionFile} --configuration {configuration}"
+        run $"dotnet restore {solutionFile} -tl"
+        run $"dotnet build {solutionFile} --configuration {configuration} -tl"
     }
 
-    stage "NuGet" { run $"dotnet pack {solutionFile} --output \"{artifactsDir}\" --configuration {configuration}" }
+    stage "NuGet" { run $"dotnet pack {solutionFile} --output \"{artifactsDir}\" --configuration {configuration} -tl" }
 
     testStage
 

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "7.0.400"
+    "version": "8.0.100"
   }
 }
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,4 +1,5 @@
 <Project>
+    <Import Project="../Directory.Build.props" />
     <ItemGroup>
         <PackageReference Include="FSharp.Analyzers.Build">
             <PrivateAssets>all</PrivateAssets>

diff --git a/src/FSharp.Formatting.ApiDocs/GenerateModel.fs b/src/FSharp.Formatting.ApiDocs/GenerateModel.fs
@@ -3132,46 +3132,28 @@ type ApiDocsSearchIndexEntry =
     }
 
 [<Obsolete("Renamed to ApiDocMember", true)>]
-type Member =
-    class
-    end
+type Member = class end
 
 [<Obsolete("Renamed to ApiDocMemberKind", true)>]
-type MemberKind =
-    class
-    end
+type MemberKind = class end
 
 [<Obsolete("Renamed to ApiDocAttribute", true)>]
-type Attribute =
-    class
-    end
+type Attribute = class end
 
 [<Obsolete("Renamed to ApiDocComment", true)>]
-type DocComment =
-    class
-    end
+type DocComment = class end
 
 [<Obsolete("Renamed to ApiDocEntity", true)>]
-type Module =
-    class
-    end
+type Module = class end
 
 [<Obsolete("Renamed to ApiDocEntityInfo", true)>]
-type ModuleInfo =
-    class
-    end
+type ModuleInfo = class end
 
 [<Obsolete("Renamed to ApiDocEntity", true)>]
-type Type =
-    class
-    end
+type Type = class end
 
 [<Obsolete("Renamed to ApiDocEntity", true)>]
-type ApiDocType =
-    class
-    end
+type ApiDocType = class end
 
 [<Obsolete("Renamed to ApiDocTypeInfo", true)>]
-type TypeInfo =
-    class
-    end
+type TypeInfo = class end
diff --git a/src/FSharp.Formatting.Literate/Evaluator.fs b/src/FSharp.Formatting.Literate/Evaluator.fs
@@ -32,9 +32,7 @@ type FsiEmbedKind =
 
 /// An interface that represents FSI evaluation result
 /// (we make this abstract so that evaluators can store other info)
-type IFsiEvaluationResult =
-    interface
-    end
+type IFsiEvaluationResult = interface end
 
 /// Represents the result of evaluating an F# snippet. This contains
 /// the generated console output together with a result and its static type.

diff --git a/src/fsdocs-tool/ProjectCracker.fs b/src/fsdocs-tool/ProjectCracker.fs
@@ -527,7 +527,7 @@ module Crack =
             | None ->
                 match setting with
                 | Some setting -> printfn "please set '%s' in 'Directory.Build.props'" setting
-                | None _ -> ()
+                | None -> ()
 
                 None
 

diff --git a/tests/FSharp.ApiDocs.Tests/FSharp.ApiDocs.Tests.fsproj b/tests/FSharp.ApiDocs.Tests/FSharp.ApiDocs.Tests.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RollForward>LatestMajor</RollForward>
     <DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
   </PropertyGroup>

diff --git a/tests/FSharp.ApiDocs.Tests/files/FsLib2/Library2.fs b/tests/FSharp.ApiDocs.Tests/files/FsLib2/Library2.fs
@@ -126,9 +126,7 @@ type Test_Empty_Code_Block() =
 module ``Space-Missing`` =
 
     /// Implicit cast operator test
-    type ``Implicit-Cast``(value: int) =
-        class
-        end
+    type ``Implicit-Cast``(value: int) = class end
 
 
 module CommentExamples =

diff --git a/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj b/tests/FSharp.CodeFormat.Tests/FSharp.CodeFormat.Tests.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RollForward>LatestMajor</RollForward>
     <DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
   </PropertyGroup>

diff --git a/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj b/tests/FSharp.Literate.Tests/FSharp.Literate.Tests.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RollForward>LatestMajor</RollForward>
     <DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
   </PropertyGroup>

diff --git a/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj b/tests/FSharp.Markdown.Tests/FSharp.Markdown.Tests.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RollForward>LatestMajor</RollForward>
     <DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
   </PropertyGroup>