Skip to content

Commit 9409e70

Browse files
committed
Fixes Fantomas
Fantomas FakaHelpers are now packages in Fantomas.Extras package
1 parent ab1e0d2 commit 9409e70

File tree

3 files changed

+15
-4
lines changed

3 files changed

+15
-4
lines changed

build.fsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ open Fake.Core.TargetOperators
1717
open Fake.Api
1818
open Fake.BuildServer
1919
open Fantomas
20-
open Fantomas.FakeHelpers
20+
open Fantomas.Extras.FakeHelpers
2121

2222

2323

@@ -355,7 +355,7 @@ let generateAssemblyInfo _ =
355355
AssemblyInfo.Metadata("GitHash", Git.Information.getCurrentSHA1(null))
356356
]
357357

358-
let getProjectDetails projectPath =
358+
let getProjectDetails (projectPath : string) =
359359
let projectName = IO.Path.GetFileNameWithoutExtension(projectPath)
360360
(
361361
projectPath,
@@ -469,7 +469,7 @@ let formatCode _ =
469469
|> Seq.collect id
470470
// Ignore AssemblyInfo
471471
|> Seq.filter(fun f -> f.EndsWith("AssemblyInfo.fs") |> not)
472-
|> formatFilesAsync FormatConfig.FormatConfig.Default
472+
|> formatFilesAsync
473473
|> Async.RunSynchronously
474474
|> Seq.iter(fun result ->
475475
match result with

paket.dependencies

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ group Build
4242
nuget Fake.BuildServer.AppVeyor 5.20.4-alpha.1642
4343
nuget Fake.BuildServer.Travis 5.20.4-alpha.1642
4444
nuget Fantomas
45+
nuget Fantomas.Extras
4546
nuget Argu
4647

4748
group Docs

paket.lock

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -711,6 +711,7 @@ NUGET
711711
FSharp.Core (>= 4.0.0.1) - restriction: >= net45
712712
FSharp.Core (>= 4.2.3) - restriction: && (< net45) (>= netstandard2.0)
713713
Microsoft.Win32.Registry (>= 4.7) - restriction: && (< net45) (>= netstandard2.0)
714+
editorconfig (0.12.2) - restriction: >= netstandard2.0
714715
Fake.Api.GitHub (5.20.4-alpha.1642)
715716
FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0
716717
Octokit (>= 0.48) - restriction: >= netstandard2.0
@@ -836,6 +837,11 @@ NUGET
836837
Fantomas (4.4)
837838
FSharp.Compiler.Service (>= 38.0.2) - restriction: >= netstandard2.0
838839
FSharp.Core (>= 5.0) - restriction: >= netstandard2.0
840+
Fantomas.Extras (4.4)
841+
editorconfig (>= 0.12.2) - restriction: >= netstandard2.0
842+
Fantomas (>= 4.4) - restriction: >= netstandard2.0
843+
FSharp.Core (>= 5.0) - restriction: >= netstandard2.0
844+
MAB.DotIgnore (>= 3.0.2) - restriction: >= netstandard2.0
839845
FParsec (1.1.1) - restriction: >= netstandard2.0
840846
FSharp.Core (>= 4.3.4) - restriction: || (>= net45) (>= netstandard2.0)
841847
System.ValueTuple (>= 4.4) - restriction: >= net45
@@ -869,6 +875,8 @@ NUGET
869875
FSharp.Core (>= 4.7.2) - restriction: >= netstandard2.0
870876
System.Reactive (>= 5.0) - restriction: >= netstandard2.0
871877
FSharp.Core (5.0.1) - restriction: >= netstandard2.0
878+
MAB.DotIgnore (3.0.2) - restriction: >= netstandard2.0
879+
NETStandard.Library (>= 1.6.1) - restriction: && (< net40) (>= netstandard1.3)
872880
Microsoft.Bcl.AsyncInterfaces (5.0) - restriction: || (&& (>= monoandroid) (< netcoreapp2.0) (>= netcoreapp2.1)) (&& (< monoandroid) (< netcoreapp2.0) (>= netcoreapp2.1) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1) (< netcoreapp3.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= monotouch) (>= netcoreapp2.1)) (&& (>= net461) (>= netcoreapp2.1)) (>= net472) (&& (< netcoreapp2.0) (>= netcoreapp2.1) (>= xamarinios)) (&& (< netcoreapp2.0) (>= netcoreapp2.1) (>= xamarinmac)) (&& (>= netcoreapp2.1) (< netstandard2.0) (>= xamarintvos)) (&& (>= netcoreapp2.1) (< netstandard2.0) (>= xamarinwatchos)) (&& (>= netcoreapp2.1) (>= uap10.1))
873881
System.Threading.Tasks.Extensions (>= 4.5.4) - restriction: || (>= net461) (&& (< netcoreapp2.1) (>= netstandard2.0) (< netstandard2.1))
874882
Microsoft.Build (16.9) - restriction: >= netstandard2.0
@@ -906,7 +914,7 @@ NUGET
906914
System.Collections.Immutable (>= 5.0) - restriction: >= netstandard2.0
907915
System.Security.Permissions (>= 4.7) - restriction: && (< net472) (>= netstandard2.0)
908916
System.Text.Encoding.CodePages (>= 4.0.1) - restriction: && (< net472) (>= netstandard2.0)
909-
Microsoft.NETCore.Platforms (5.0.2) - restriction: || (&& (>= monoandroid) (>= netcoreapp2.1)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard2.0) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1)) (&& (>= monotouch) (>= netcoreapp2.1)) (&& (>= net461) (>= netcoreapp2.1)) (&& (>= netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= netcoreapp2.0) (&& (>= netcoreapp2.1) (< netcoreapp3.0)) (&& (>= netcoreapp2.1) (>= uap10.1)) (&& (>= netcoreapp3.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
917+
Microsoft.NETCore.Platforms (5.0.2) - restriction: || (&& (>= monoandroid) (>= netcoreapp2.1)) (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard2.0) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (>= netcoreapp2.1)) (&& (>= monotouch) (>= netcoreapp2.1)) (&& (< net40) (>= netstandard2.0)) (&& (>= net461) (>= netcoreapp2.1)) (&& (>= netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (>= netcoreapp2.0) (&& (>= netcoreapp2.1) (< netcoreapp3.0)) (&& (>= netcoreapp2.1) (>= uap10.1)) (&& (>= netcoreapp3.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< netstandard1.0) (>= netstandard2.0) (>= win8)) (&& (< netstandard1.3) (>= netstandard2.0) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= netstandard2.0) (>= uap10.0)) (&& (>= netstandard2.0) (>= uap10.1)) (&& (>= netstandard2.0) (>= wp8))
910918
Microsoft.NETCore.Targets (5.0) - restriction: || (&& (< monoandroid) (< net45) (< netstandard1.2) (>= netstandard2.0) (< win8)) (&& (< monoandroid) (< net45) (< netstandard1.3) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (< netstandard1.5) (>= netstandard2.0) (< win8) (< wpa81)) (&& (< monoandroid) (< net45) (>= netstandard2.0) (< win8) (< wpa81) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (< monoandroid) (< net46) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)) (&& (>= netcoreapp1.1) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos))
911919
Microsoft.VisualStudio.Setup.Configuration.Interop (1.16.30) - restriction: >= net472
912920
Microsoft.Win32.Primitives (4.3) - restriction: && (< monoandroid) (< net46) (>= netstandard2.0) (< xamarinios) (< xamarinmac) (< xamarintvos) (< xamarinwatchos)
@@ -926,6 +934,8 @@ NUGET
926934
Microsoft.Build.Framework (>= 16.4) - restriction: >= netstandard2.0
927935
Microsoft.Build.Tasks.Core (>= 16.4) - restriction: >= netstandard2.0
928936
Microsoft.Build.Utilities.Core (>= 16.4) - restriction: >= netstandard2.0
937+
NETStandard.Library (2.0.3) - restriction: && (< net40) (>= netstandard2.0)
938+
Microsoft.NETCore.Platforms (>= 1.1) - restriction: || (&& (>= net45) (< netstandard1.3)) (&& (< net45) (>= netstandard1.1) (< netstandard1.2) (< win8)) (&& (< net45) (>= netstandard1.2) (< netstandard1.3) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.3) (< netstandard1.4) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.4) (< netstandard1.5) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.5) (< netstandard1.6) (< win8) (< wpa81)) (&& (< net45) (>= netstandard1.6) (< netstandard2.0) (< win8) (< wpa81)) (&& (< net45) (>= netstandard2.0)) (&& (>= net46) (< netstandard1.4)) (>= net461) (>= netcoreapp2.0) (&& (>= netstandard1.0) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8) (< win8)) (&& (< netstandard1.0) (< portable-net45+win8) (>= portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= portable-net45+win8+wp8+wpa81) (< portable-net45+win8+wpa81)) (&& (< netstandard1.0) (>= win8)) (&& (< netstandard1.3) (< win8) (>= wpa81)) (&& (< netstandard1.5) (>= uap10.0)) (>= uap10.1) (>= wp8)
929939
Newtonsoft.Json (13.0.1) - restriction: >= netstandard2.0
930940
NuGet.Common (5.9.1) - restriction: >= netstandard2.0
931941
NuGet.Frameworks (>= 5.9.1) - restriction: || (>= net45) (>= netstandard2.0)

0 commit comments

Comments
 (0)