Upgrade .NET SDK to 6.0.200. (fsprojects#2105)

jindraivanek · Mar 30, 2022 · 70c59e9 · 70c59e9
1 parent ed46b85
commit 70c59e9
Show file tree

Hide file tree

Showing 10 changed files with 337 additions and 322 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-alpha018",
       "commands": [
         "paket"
       ]
     },
     "fake-cli": {
-      "version": "5.20.4",
+      "version": "5.22.0",
       "commands": [
         "fake"
       ]
@@ -21,7 +21,7 @@
       ]
     },
     "fantomas-tool": {
-      "version": "4.6.1",
+      "version": "4.6.5",
       "commands": [
         "fantomas"
       ]

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.200]
     runs-on: ${{ matrix.os }}
 
     steps:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## [Unreleased]
+
+### Changed
+* Update .NET SDK to 6.0.200. [#2105](https://github.com/fsprojects/fantomas/pull/2105)
+
 ## [4.6.5] - 2022-02-18
 
 ### Changed

diff --git a/build.fsx b/build.fsx
@@ -289,7 +289,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",
+    "version": "6.0.200",
     "rollForward": "latestMinor"
   }
 }
diff --git a/paket.dependencies b/paket.dependencies
@@ -1,20 +1,20 @@
 source https://api.nuget.org/v3/index.json
 
-framework: netstandard2.0, net5.0, netcoreapp3.1
+framework: netstandard2.0, net6.0, netcoreapp3.1
 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 NUnit3TestAdapter 4.0.0-beta.1
+nuget Microsoft.NET.Test.Sdk
+nuget nunit
+nuget NUnit3TestAdapter
 nuget NunitXml.TestLogger
 nuget Argu
 nuget BenchmarkDotNet
 nuget editorconfig
-nuget MAB.DotIgnore 3.0.2
+nuget MAB.DotIgnore
 nuget Ionide.KeepAChangelog.Tasks copy_local: true
 nuget Dotnet.ReproducibleBuilds copy_local: true
 
@@ -26,7 +26,7 @@ group build
     source https://api.nuget.org/v3/index.json
 
     nuget Microsoft.Azure.Cosmos.Table
-    nuget FSharp.Core ~> 5
+    nuget FSharp.Core ~> 5 content: none
     nuget Fake.Core.ReleaseNotes
     nuget Fake.Core.Xml
     nuget Fake.DotNet.Cli
@@ -40,7 +40,7 @@ group tool
     storage: none
     source https://api.nuget.org/v3/index.json
 
-    nuget FSharp.Core 6.0.1
+    nuget FSharp.Core 6.0.1 content: none
     nuget Argu
     nuget StreamJsonRpc
     nuget Thoth.Json.Net
@@ -52,7 +52,7 @@ group client
     storage: none
     source https://api.nuget.org/v3/index.json
 
-    nuget FSharp.Core 5
+    nuget FSharp.Core 5 content: none
     nuget StreamJsonRpc
 
     nuget SemanticVersioning
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>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

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>
     <NoWarn>FS0988</NoWarn>

diff --git a/src/Fantomas.Tests/Fantomas.Tests.fsproj b/src/Fantomas.Tests/Fantomas.Tests.fsproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <NoWarn>FS0988</NoWarn>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <WarningsAsErrors>FS0025</WarningsAsErrors>
     <IsPackable>false</IsPackable>
   </PropertyGroup>