Skip to content

Commit

Permalink
Switch to dotnet format rather than dotnet-format tool (#2480)
Browse files Browse the repository at this point in the history
As titled.

I will follow up with a PR applying the formatting to all files and then
a further PR introducing a check format step in the CI builds.

Closes #2327
  • Loading branch information
stevejgordon authored Nov 12, 2024
1 parent 57e358e commit f208488
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
6 changes: 2 additions & 4 deletions build/scripts/Build.fs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ open Scripts.TestEnvironment
open Tooling

module Build =

let private oldDiagnosticSourceVersion = SemVer.parse "4.6.0"
let private diagnosticSourceVersion6 = SemVer.parse "6.0.0"

Expand Down Expand Up @@ -238,9 +238,7 @@ module Build =
if isWindows then DotNet.Exec ["restore" ; aspNetFullFramework; "-v"; "q"]

let Format () =
ToolRestore()
//dotnet dotnet-format --exclude src/Elastic.Apm/Libraries/
DotNet.Exec ["dotnet-format"; "--check"; "--exclude"; "src/Elastic.Apm/Libraries/"]
DotNet.Exec ["dotnet"; "format"; "--verbosity"; "quiet"; "--exclude"; "src/Elastic.Apm/Libraries/"]

let private copyDllsAndPdbs (destination: DirectoryInfo) (source: DirectoryInfo) =
source.GetFiles()
Expand Down
6 changes: 0 additions & 6 deletions dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,6 @@
"commands": [
"minver"
]
},
"dotnet-format": {
"version": "5.1.250801",
"commands": [
"dotnet-format"
]
}
}
}

0 comments on commit f208488

Please sign in to comment.