Skip to content

Commit c56bcdc

Browse files
committed
Update dotnet SDK & fantomas
1 parent 53a00e2 commit c56bcdc

File tree

13 files changed

+23
-47
lines changed

13 files changed

+23
-47
lines changed

.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"fantomas": {
6-
"version": "6.2.3",
6+
"version": "6.3.0-alpha-003",
77
"commands": [
88
"fantomas"
99
]

CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
## Building and Development
33

44
- Clone the repository
5-
- Build with `build.cmd` or `build.sh`
5+
- Build with `dotnet build`
66
- Open `FSharp.Formatting.sln` with Visual Studio or Visual Studio Code (with the ionide-fsharp extension)
77

88
## Source Formatting

FSharp.Formatting.sln

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "project", "project", "{194B
88
.dockerignore = .dockerignore
99
.editorconfig = .editorconfig
1010
.gitignore = .gitignore
11-
build.cmd = build.cmd
1211
build.fsx = build.fsx
13-
build.sh = build.sh
1412
Directory.Build.props = Directory.Build.props
1513
docker-build.sh = docker-build.sh
1614
Dockerfile = Dockerfile

build.fsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ let lintStage =
4747
let testStage =
4848
stage "Tests" {
4949
run
50-
$"dotnet test {solutionFile} --configuration {configuration} --no-build --blame --logger trx --framework net7.0 --results-directory TestResults"
50+
$"dotnet test {solutionFile} --configuration {configuration} --no-build --blame --logger trx --framework net7.0 --results-directory TestResults -tl"
5151
}
5252

5353
pipeline "CI" {
@@ -61,11 +61,11 @@ pipeline "CI" {
6161
}
6262

6363
stage "Build" {
64-
run $"dotnet restore {solutionFile}"
65-
run $"dotnet build {solutionFile} --configuration {configuration}"
64+
run $"dotnet restore {solutionFile} -tl"
65+
run $"dotnet build {solutionFile} --configuration {configuration} -tl"
6666
}
6767

68-
stage "NuGet" { run $"dotnet pack {solutionFile} --output \"{artifactsDir}\" --configuration {configuration}" }
68+
stage "NuGet" { run $"dotnet pack {solutionFile} --output \"{artifactsDir}\" --configuration {configuration} -tl" }
6969

7070
testStage
7171

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"sdk": {
3-
"version": "7.0.400"
3+
"version": "8.0.100"
44
}
55
}

src/FSharp.Formatting.ApiDocs/GenerateModel.fs

Lines changed: 9 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -3132,46 +3132,28 @@ type ApiDocsSearchIndexEntry =
31323132
}
31333133

31343134
[<Obsolete("Renamed to ApiDocMember", true)>]
3135-
type Member =
3136-
class
3137-
end
3135+
type Member = class end
31383136

31393137
[<Obsolete("Renamed to ApiDocMemberKind", true)>]
3140-
type MemberKind =
3141-
class
3142-
end
3138+
type MemberKind = class end
31433139

31443140
[<Obsolete("Renamed to ApiDocAttribute", true)>]
3145-
type Attribute =
3146-
class
3147-
end
3141+
type Attribute = class end
31483142

31493143
[<Obsolete("Renamed to ApiDocComment", true)>]
3150-
type DocComment =
3151-
class
3152-
end
3144+
type DocComment = class end
31533145

31543146
[<Obsolete("Renamed to ApiDocEntity", true)>]
3155-
type Module =
3156-
class
3157-
end
3147+
type Module = class end
31583148

31593149
[<Obsolete("Renamed to ApiDocEntityInfo", true)>]
3160-
type ModuleInfo =
3161-
class
3162-
end
3150+
type ModuleInfo = class end
31633151

31643152
[<Obsolete("Renamed to ApiDocEntity", true)>]
3165-
type Type =
3166-
class
3167-
end
3153+
type Type = class end
31683154

31693155
[<Obsolete("Renamed to ApiDocEntity", true)>]
3170-
type ApiDocType =
3171-
class
3172-
end
3156+
type ApiDocType = class end
31733157

31743158
[<Obsolete("Renamed to ApiDocTypeInfo", true)>]
3175-
type TypeInfo =
3176-
class
3177-
end
3159+
type TypeInfo = class end

src/FSharp.Formatting.Literate/Evaluator.fs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,7 @@ type FsiEmbedKind =
3232

3333
/// An interface that represents FSI evaluation result
3434
/// (we make this abstract so that evaluators can store other info)
35-
type IFsiEvaluationResult =
36-
interface
37-
end
35+
type IFsiEvaluationResult = interface end
3836

3937
/// Represents the result of evaluating an F# snippet. This contains
4038
/// the generated console output together with a result and its static type.

src/fsdocs-tool/ProjectCracker.fs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -527,7 +527,7 @@ module Crack =
527527
| None ->
528528
match setting with
529529
| Some setting -> printfn "please set '%s' in 'Directory.Build.props'" setting
530-
| None _ -> ()
530+
| None -> ()
531531

532532
None
533533

tests/FSharp.ApiDocs.Tests/FSharp.ApiDocs.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>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<RollForward>LatestMajor</RollForward>
66
<DisableMSBuildAssemblyCopyCheck>true</DisableMSBuildAssemblyCopyCheck>
77
</PropertyGroup>

tests/FSharp.ApiDocs.Tests/files/FsLib2/Library2.fs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,7 @@ type Test_Empty_Code_Block() =
126126
module ``Space-Missing`` =
127127

128128
/// Implicit cast operator test
129-
type ``Implicit-Cast``(value: int) =
130-
class
131-
end
129+
type ``Implicit-Cast``(value: int) = class end
132130

133131

134132
module CommentExamples =

0 commit comments

Comments
 (0)