diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json index 7c6ddb35d9..41ee716a8d 100644 --- a/.config/dotnet-tools.json +++ b/.config/dotnet-tools.json @@ -21,7 +21,7 @@ ] }, "fantomas-tool": { - "version": "4.7.0", + "version": "4.7.5", "commands": [ "fantomas" ] diff --git a/CHANGELOG.md b/CHANGELOG.md index b7863cfee8..db32d124e1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [Unreleased] + +### Fixed +* SRTP or condition disappear when non-generic type is used. [#2168](https://github.com/fsprojects/fantomas/issues/2168) + ## [4.7.5] - 2022-03-27 ### Fixed diff --git a/paket.dependencies b/paket.dependencies index 032a95d907..ad71a4d885 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -15,6 +15,8 @@ nuget Argu nuget BenchmarkDotNet nuget editorconfig nuget MAB.DotIgnore +nuget System.IO.Abstractions +nuget System.IO.Abstractions.TestingHelpers nuget Ionide.KeepAChangelog.Tasks copy_local: true nuget Dotnet.ReproducibleBuilds copy_local: true diff --git a/paket.lock b/paket.lock index 951a0a694b..4dfcfb6067 100644 --- a/paket.lock +++ b/paket.lock @@ -327,10 +327,10 @@ NUGET System.Runtime (>= 4.3) System.Text.Encoding (>= 4.3) System.Threading.Tasks (>= 4.3) - System.IO.Abstractions (16.1.10) + System.IO.Abstractions (16.1.25) System.IO.FileSystem.AccessControl (>= 4.7) - restriction: || (&& (== net6.0) (< net5.0)) (&& (== net6.0) (< netstandard2.1)) (== netcoreapp3.1) (== netstandard2.0) - System.IO.Abstractions.TestingHelpers (16.1.10) - System.IO.Abstractions (>= 16.1.10) + System.IO.Abstractions.TestingHelpers (16.1.25) + System.IO.Abstractions (>= 16.1.25) System.IO.FileSystem (4.3) Microsoft.NETCore.Platforms (>= 1.1) Microsoft.NETCore.Targets (>= 1.1) diff --git a/src/Fantomas/paket.references b/src/Fantomas/paket.references index 4d92d1df9e..d2919492e9 100644 --- a/src/Fantomas/paket.references +++ b/src/Fantomas/paket.references @@ -1,6 +1,4 @@ FSharp.Compiler.Service FSharp.Core Ionide.KeepAChangelog.Tasks copy_local: true -Dotnet.ReproducibleBuilds copy_local: true -System.IO.Abstractions -System.IO.Abstractions.TestingHelpers \ No newline at end of file +Dotnet.ReproducibleBuilds copy_local: true \ No newline at end of file