Update to .NET 6.

fsprojects · Jan 29, 2022 · 388c8e2 · 388c8e2
1 parent 4a65cb4
commit 388c8e2
Show file tree

Hide file tree

Showing 11 changed files with 323 additions and 313 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,13 +3,13 @@
   "isRoot": true,
   "tools": {
     "paket": {
-      "version": "6.0.13",
+      "version": "7.0.0-alpha003",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "5.20.4",
+      "version": "5.21.0-alpha004",
       "commands": [
         "fake"
       ]

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, windows-latest, macOS-latest]
-        dotnet: [5.0.401]
+        dotnet: [6.0.100]
     runs-on: ${{ matrix.os }}
 
     steps:

diff --git a/build.fsx b/build.fsx
@@ -105,7 +105,7 @@ let fantomasExecutableForExternalTests projectdir =
         | DotNet.BuildConfiguration.Custom s -> s
 
     { ProcessName = "dotnet"
-      Arguments = [ sprintf "%s/src/Fantomas.CoreGlobalTool/bin/%s/net5.0/fantomas-tool.dll" projectdir configuration ] }
+      Arguments = [ sprintf "%s/src/Fantomas.CoreGlobalTool/bin/%s/net6.0/fantomas-tool.dll" projectdir configuration ] }
 
 let externalProjectsToTest =
     [
@@ -382,7 +382,7 @@ Target.create "Benchmark" (fun _ ->
          </> "Fantomas.Benchmarks"
          </> "bin"
          </> "Release"
-         </> "net5.0"
+         </> "net6.0"
          </> "Fantomas.Benchmarks.dll")
         ""
     |> ignore

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "5.0.0",
-    "rollForward": "latestMinor"
+    "version": "6.0.100",
+    "rollForward": "latestMajor"
   }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,14 +1,14 @@
 source https://api.nuget.org/v3/index.json
 
-framework: netstandard2.0, net5.0, netcoreapp3.1
+framework: netstandard2.0, net6.0
 storage: none
 
-nuget FSharp.Core 6.0.1
+nuget FSharp.Core 6.0.1 content: none
 nuget FSharp.Compiler.Service 41.0.1
 nuget FsUnit
 nuget FsCheck
-nuget Microsoft.NET.Test.Sdk 16.9.1
-nuget nunit 3.13.1
+nuget Microsoft.NET.Test.Sdk
+nuget nunit 3.13.2
 nuget NUnit3TestAdapter 4.0.0-beta.1
 nuget NunitXml.TestLogger
 nuget Argu

diff --git a/paket.lock b/paket.lock
diff --git a/src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj b/src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj
@@ -2,7 +2,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Fantomas.CoreGlobalTool.Tests/Fantomas.CoreGlobalTool.Tests.fsproj b/src/Fantomas.CoreGlobalTool.Tests/Fantomas.CoreGlobalTool.Tests.fsproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <GenerateProgramFile>false</GenerateProgramFile>
     <Version>4.6.0</Version>

diff --git a/src/Fantomas.CoreGlobalTool.Tests/TestHelpers.fs b/src/Fantomas.CoreGlobalTool.Tests/TestHelpers.fs
@@ -118,7 +118,7 @@ let getFantomasToolStartInfo arguments : ProcessStartInfo =
             "Fantomas.CoreGlobalTool",
             "bin",
             configuration,
-            "netcoreapp3.1",
+            "net6.0",
             "fantomas-tool.dll"
         )
 

diff --git a/src/Fantomas.CoreGlobalTool/Fantomas.CoreGlobalTool.fsproj b/src/Fantomas.CoreGlobalTool/Fantomas.CoreGlobalTool.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <!-- Don't create localization (en-US, etc) folders with resources -->
     <!-- https://github.com/dotnet/fsharp/issues/6007#issuecomment-547041463 -->
     <SatelliteResourceLanguages>en</SatelliteResourceLanguages>

diff --git a/src/Fantomas.Tests/Fantomas.Tests.fsproj b/src/Fantomas.Tests/Fantomas.Tests.fsproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <Version>4.6.0</Version>
     <NoWarn>FS0988</NoWarn>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
   </PropertyGroup>
   <ItemGroup>