Skip to content

Commit 388c8e2

Browse files
committed
Update to .NET 6.
1 parent 4a65cb4 commit 388c8e2

File tree

11 files changed

+323
-313
lines changed

11 files changed

+323
-313
lines changed

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
"isRoot": true,
44
"tools": {
55
"paket": {
6-
"version": "6.0.13",
6+
"version": "7.0.0-alpha003",
77
"commands": [
88
"paket"
99
]
1010
},
1111
"fake-cli": {
12-
"version": "5.20.4",
12+
"version": "5.21.0-alpha004",
1313
"commands": [
1414
"fake"
1515
]

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ubuntu-latest, windows-latest, macOS-latest]
15-
dotnet: [5.0.401]
15+
dotnet: [6.0.100]
1616
runs-on: ${{ matrix.os }}
1717

1818
steps:

build.fsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ let fantomasExecutableForExternalTests projectdir =
105105
| DotNet.BuildConfiguration.Custom s -> s
106106

107107
{ ProcessName = "dotnet"
108-
Arguments = [ sprintf "%s/src/Fantomas.CoreGlobalTool/bin/%s/net5.0/fantomas-tool.dll" projectdir configuration ] }
108+
Arguments = [ sprintf "%s/src/Fantomas.CoreGlobalTool/bin/%s/net6.0/fantomas-tool.dll" projectdir configuration ] }
109109

110110
let externalProjectsToTest =
111111
[
@@ -382,7 +382,7 @@ Target.create "Benchmark" (fun _ ->
382382
</> "Fantomas.Benchmarks"
383383
</> "bin"
384384
</> "Release"
385-
</> "net5.0"
385+
</> "net6.0"
386386
</> "Fantomas.Benchmarks.dll")
387387
""
388388
|> ignore

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "5.0.0",
4-
"rollForward": "latestMinor"
3+
"version": "6.0.100",
4+
"rollForward": "latestMajor"
55
}
66
}

paket.dependencies

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
source https://api.nuget.org/v3/index.json
22

3-
framework: netstandard2.0, net5.0, netcoreapp3.1
3+
framework: netstandard2.0, net6.0
44
storage: none
55

6-
nuget FSharp.Core 6.0.1
6+
nuget FSharp.Core 6.0.1 content: none
77
nuget FSharp.Compiler.Service 41.0.1
88
nuget FsUnit
99
nuget FsCheck
10-
nuget Microsoft.NET.Test.Sdk 16.9.1
11-
nuget nunit 3.13.1
10+
nuget Microsoft.NET.Test.Sdk
11+
nuget nunit 3.13.2
1212
nuget NUnit3TestAdapter 4.0.0-beta.1
1313
nuget NunitXml.TestLogger
1414
nuget Argu

paket.lock

Lines changed: 307 additions & 297 deletions
Large diffs are not rendered by default.

src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
<WarningsAsErrors>FS0025</WarningsAsErrors>
77
</PropertyGroup>
88
<ItemGroup>

src/Fantomas.CoreGlobalTool.Tests/Fantomas.CoreGlobalTool.Tests.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project Sdk="Microsoft.NET.Sdk">
33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<GenerateProgramFile>false</GenerateProgramFile>
77
<Version>4.6.0</Version>

src/Fantomas.CoreGlobalTool.Tests/TestHelpers.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ let getFantomasToolStartInfo arguments : ProcessStartInfo =
118118
"Fantomas.CoreGlobalTool",
119119
"bin",
120120
configuration,
121-
"netcoreapp3.1",
121+
"net6.0",
122122
"fantomas-tool.dll"
123123
)
124124

src/Fantomas.CoreGlobalTool/Fantomas.CoreGlobalTool.fsproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<!-- Don't create localization (en-US, etc) folders with resources -->
66
<!-- https://github.com/dotnet/fsharp/issues/6007#issuecomment-547041463 -->
77
<SatelliteResourceLanguages>en</SatelliteResourceLanguages>

0 commit comments

Comments
 (0)