diff --git a/Directory.Build.props b/Directory.Build.props
index 0c139855d9..abef3a92a0 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -41,8 +41,6 @@ Some common use cases include:
ee4a810ffe9e984e2ec8c55a9cb6d1c6631dd0b3
- 2.8.28
- 6.0.1
@@ -52,22 +50,16 @@ Some common use cases include:
images/favicon.ico
https://github.com/fsprojects/fantomas
-
-
-
-
-
-
-
+
-
+
all
build
-
+
all
runtime; build; native; contentfiles; analyzers
-
+
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 2a461d4d44..3f72de7587 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,4 +1,10 @@
+
+
+
+
+
+
.
--analyzers-path "$(PkgG-Research_FSharp_Analyzers)/analyzers/dotnet/fs"
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 0000000000..b6fa203ebe
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,40 @@
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj b/src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj
index 6c62831558..939e463e56 100644
--- a/src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj
+++ b/src/Fantomas.Benchmarks/Fantomas.Benchmarks.fsproj
@@ -10,8 +10,8 @@
-
-
+
+
diff --git a/src/Fantomas.Benchmarks/packages.lock.json b/src/Fantomas.Benchmarks/packages.lock.json
index 359b415bda..da7893caf4 100644
--- a/src/Fantomas.Benchmarks/packages.lock.json
+++ b/src/Fantomas.Benchmarks/packages.lock.json
@@ -1,25 +1,23 @@
{
- "version": 1,
+ "version": 2,
"dependencies": {
"net7.0": {
"BenchmarkDotNet": {
"type": "Direct",
- "requested": "[0.13.2, )",
- "resolved": "0.13.2",
- "contentHash": "82IflYxY8qnQXEA3kXtqC9pntrkJYJZbQ9PV7hEV/XcfCtOdwLz84ilyO8tLRVbiliWttvmt/v44P+visN+fPQ==",
+ "requested": "[0.13.11, )",
+ "resolved": "0.13.11",
+ "contentHash": "BSsrfesUFgrjy/MtlupiUrZKgcBCCKmFXmNaVQLrBCs0/2iE/qH1puN7lskTE9zM0+MdiCr09zKk6MXKmwmwxw==",
"dependencies": {
- "BenchmarkDotNet.Annotations": "0.13.2",
- "CommandLineParser": "2.4.3",
+ "BenchmarkDotNet.Annotations": "0.13.11",
+ "CommandLineParser": "2.9.1",
+ "Gee.External.Capstone": "2.3.0",
"Iced": "1.17.0",
- "Microsoft.CodeAnalysis.CSharp": "3.0.0",
+ "Microsoft.CodeAnalysis.CSharp": "4.1.0",
"Microsoft.Diagnostics.Runtime": "2.2.332302",
"Microsoft.Diagnostics.Tracing.TraceEvent": "3.0.2",
"Microsoft.DotNet.PlatformAbstractions": "3.1.6",
- "Perfolizer": "0.2.1",
- "System.Management": "6.0.0",
- "System.Reflection.Emit": "4.7.0",
- "System.Reflection.Emit.Lightweight": "4.7.0",
- "System.Threading.Tasks.Extensions": "4.5.4"
+ "Perfolizer": "[0.2.1]",
+ "System.Management": "5.0.0"
}
},
"FSharp.Analyzers.Build": {
@@ -33,9 +31,9 @@
},
"FSharp.Core": {
"type": "Direct",
- "requested": "[6.0.4, )",
- "resolved": "6.0.4",
- "contentHash": "CYqAfmO7JvN38M+ACkstS8taVfl8C0mCkvSiBAshfKuu2Nut6+8MuFU7Wahu09wGIyFPlRz5ArFWxSOM5mhMSA=="
+ "requested": "[6.0.1, )",
+ "resolved": "6.0.1",
+ "contentHash": "VrFAiW8dEEekk+0aqlbvMNZzDvYXmgWZwAt68AUBqaWK8RnoEVUNglj66bZzhs4/U63q0EfXlhcEKnH1sTYLjw=="
},
"G-Research.FSharp.Analyzers": {
"type": "Direct",
@@ -51,13 +49,18 @@
},
"BenchmarkDotNet.Annotations": {
"type": "Transitive",
- "resolved": "0.13.2",
- "contentHash": "+SGOYyXT6fiagbtrni38B8BqBgjruYKU3PfROI0lDIYo8jQ+APUmLKMEswK7zwR5fEOCrDmoAHSH6oykBkqPgA=="
+ "resolved": "0.13.11",
+ "contentHash": "JOX+Bhp+PNnAtu/er9iGiN8QRIrYzilxUcJbwrF8VYyTNE8r4jlewa17/FbW1G7Jp2JUZwVS1A8a0bGILKhikw=="
},
"CommandLineParser": {
"type": "Transitive",
- "resolved": "2.4.3",
- "contentHash": "U2FC9Y8NyIxxU6MpFFdWWu1xwiqz/61v/Doou7kmVjpeIEMLWyiNNkzNlSE84kyJ0O1LKApuEj5z48Ow0Hi4OQ=="
+ "resolved": "2.9.1",
+ "contentHash": "OE0sl1/sQ37bjVsPKKtwQlWDgqaxWgtme3xZz7JssWUzg5JpMIyHgCTY9MVMxOg48fJ1AgGT3tgdH5m/kQ5xhA=="
+ },
+ "Gee.External.Capstone": {
+ "type": "Transitive",
+ "resolved": "2.3.0",
+ "contentHash": "2ap/rYmjtzCOT8hxrnEW/QeiOt+paD8iRrIcdKX0cxVwWLFa1e+JDBNeECakmccXrSFeBQuu5AV8SNkipFMMMw=="
},
"Iced": {
"type": "Transitive",
@@ -71,29 +74,29 @@
},
"Microsoft.CodeAnalysis.Analyzers": {
"type": "Transitive",
- "resolved": "2.6.2-beta2",
- "contentHash": "rg5Ql73AmGCMG5Q40Kzbndq7C7S4XvsJA+2QXfZBCy2dRqD+a7BSbx/3942EoRUJ/8Wh9+kLg2G2qC46o3f1Aw=="
+ "resolved": "3.3.3",
+ "contentHash": "j/rOZtLMVJjrfLRlAMckJLPW/1rze9MT1yfWqSIbUPGRu1m1P0fuo9PmqapwsmePfGB5PJrudQLvmUOAMF0DqQ=="
},
"Microsoft.CodeAnalysis.Common": {
"type": "Transitive",
- "resolved": "3.0.0",
- "contentHash": "HEnLZ9Op5IoXeuokhfSLIXstXfEyPzXhQ/xsnvUmxzb+7YpwuLk57txArzGs/Wne5bWmU7Uey4Q1jUZ3++heqg==",
+ "resolved": "4.1.0",
+ "contentHash": "bNzTyxP3iD5FPFHfVDl15Y6/wSoI7e3MeV0lOaj9igbIKTjgrmuw6LoVJ06jUNFA7+KaDC/OIsStWl/FQJz6sQ==",
"dependencies": {
- "Microsoft.CodeAnalysis.Analyzers": "2.6.2-beta2",
- "System.Collections.Immutable": "1.5.0",
- "System.Memory": "4.5.1",
- "System.Reflection.Metadata": "1.6.0",
- "System.Runtime.CompilerServices.Unsafe": "4.5.0",
- "System.Text.Encoding.CodePages": "4.5.0",
- "System.Threading.Tasks.Extensions": "4.5.0"
+ "Microsoft.CodeAnalysis.Analyzers": "3.3.3",
+ "System.Collections.Immutable": "5.0.0",
+ "System.Memory": "4.5.4",
+ "System.Reflection.Metadata": "5.0.0",
+ "System.Runtime.CompilerServices.Unsafe": "5.0.0",
+ "System.Text.Encoding.CodePages": "4.5.1",
+ "System.Threading.Tasks.Extensions": "4.5.4"
}
},
"Microsoft.CodeAnalysis.CSharp": {
"type": "Transitive",
- "resolved": "3.0.0",
- "contentHash": "hWFUxc0iUbVvIKWJODErOeOa5GiqZuEcetxaCfHqZ04zHy0ZCLx3v4/TdF/6Erx1mXPHfoT2Tiz5rZCQZ6OyxQ==",
+ "resolved": "4.1.0",
+ "contentHash": "sbu6kDGzo9bfQxuqWpeEE7I9P30bSuZEnpDz9/qz20OU6pm79Z63+/BsAzO2e/R/Q97kBrpj647wokZnEVr97w==",
"dependencies": {
- "Microsoft.CodeAnalysis.Common": "[3.0.0]"
+ "Microsoft.CodeAnalysis.Common": "[4.1.0]"
}
},
"Microsoft.Diagnostics.NETCore.Client": {
@@ -193,8 +196,8 @@
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
- "resolved": "2.0.0",
- "contentHash": "VdLJOCXhZaEMY7Hm2GKiULmn7IEPFE4XC5LPSfBVCUIA8YLZVh846gtfBJalsPQF2PlzdD7ecX7DZEulJ402ZQ=="
+ "resolved": "5.0.0",
+ "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ=="
},
"Microsoft.NETCore.Targets": {
"type": "Transitive",
@@ -211,6 +214,15 @@
"System.Runtime": "4.3.0"
}
},
+ "Microsoft.Win32.Registry": {
+ "type": "Transitive",
+ "resolved": "5.0.0",
+ "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==",
+ "dependencies": {
+ "System.Security.AccessControl": "5.0.0",
+ "System.Security.Principal.Windows": "5.0.0"
+ }
+ },
"NETStandard.Library": {
"type": "Transitive",
"resolved": "1.6.1",
@@ -399,8 +411,8 @@
},
"System.CodeDom": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "CPc6tWO1LAer3IzfZufDBRL+UZQcj5uS207NHALQzP84Vp/z6wF0Aa0YZImOQY8iStY0A2zI/e3ihKNPfUm8XA=="
+ "resolved": "5.0.0",
+ "contentHash": "JPJArwA1kdj8qDAkY2XGjSWoYnqiM7q/3yRNkt6n28Mnn95MuEGkZXUbPBf7qc3IjwrGY5ttQon7yqHZyQJmOQ=="
},
"System.Collections": {
"type": "Transitive",
@@ -456,11 +468,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "7.0.0",
- "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw=="
- },
"System.Diagnostics.Tools": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -626,17 +633,14 @@
},
"System.Management": {
"type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "sHsESYMmPDhQuOC66h6AEOs/XowzKsbT9srMbX71TCXP58hkpn1BqBjdmKj1+DCA/WlBETX1K5WjQHwmV0Txrg==",
+ "resolved": "5.0.0",
+ "contentHash": "MF1CHaRcC+MLFdnDthv4/bKWBZnlnSpkGqa87pKukQefgEdwtb9zFW6zs0GjPp73qtpYYg4q6PEKbzJbxCpKfw==",
"dependencies": {
- "System.CodeDom": "6.0.0"
+ "Microsoft.NETCore.Platforms": "5.0.0",
+ "Microsoft.Win32.Registry": "5.0.0",
+ "System.CodeDom": "5.0.0"
}
},
- "System.Memory": {
- "type": "Transitive",
- "resolved": "4.5.5",
- "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
- },
"System.Net.Http": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -720,8 +724,15 @@
},
"System.Reflection.Emit": {
"type": "Transitive",
- "resolved": "4.7.0",
- "contentHash": "VR4kk8XLKebQ4MZuKuIni/7oh+QGFmZW3qORd1GvBq/8026OpW501SzT/oypwiQl4TvT8ErnReh/NzY9u+C6wQ=="
+ "resolved": "4.3.0",
+ "contentHash": "228FG0jLcIwTVJyz8CLFKueVqQK36ANazUManGaJHkO0icjiIypKW7YLWLIWahyIkdh5M7mV2dJepllLyA1SKg==",
+ "dependencies": {
+ "System.IO": "4.3.0",
+ "System.Reflection": "4.3.0",
+ "System.Reflection.Emit.ILGeneration": "4.3.0",
+ "System.Reflection.Primitives": "4.3.0",
+ "System.Runtime": "4.3.0"
+ }
},
"System.Reflection.Emit.ILGeneration": {
"type": "Transitive",
@@ -735,8 +746,14 @@
},
"System.Reflection.Emit.Lightweight": {
"type": "Transitive",
- "resolved": "4.7.0",
- "contentHash": "a4OLB4IITxAXJeV74MDx49Oq2+PsF6Sml54XAFv+2RyWwtDBcabzoxiiJRhdhx+gaohLh4hEGCLQyBozXoQPqA=="
+ "resolved": "4.3.0",
+ "contentHash": "oadVHGSMsTmZsAF864QYN1t1QzZjIcuKU3l2S9cZOwDdDueNTrqq1yRj7koFfIGEnKpt6NjpL3rOzRhs4ryOgA==",
+ "dependencies": {
+ "System.Reflection": "4.3.0",
+ "System.Reflection.Emit.ILGeneration": "4.3.0",
+ "System.Reflection.Primitives": "4.3.0",
+ "System.Runtime": "4.3.0"
+ }
},
"System.Reflection.Extensions": {
"type": "Transitive",
@@ -751,8 +768,8 @@
},
"System.Reflection.Metadata": {
"type": "Transitive",
- "resolved": "1.6.0",
- "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
+ "resolved": "5.0.0",
+ "contentHash": "5NecZgXktdGg34rh1OenY1rFNDCI8xSjFr+Z4OU4cU06AQHUdRnIIEeWENu3Wl4YowbzkymAIMvi3WyK9U53pQ=="
},
"System.Reflection.Primitives": {
"type": "Transitive",
@@ -785,15 +802,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Runtime": {
- "type": "Transitive",
- "resolved": "4.3.1",
- "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.1",
- "Microsoft.NETCore.Targets": "1.1.3"
- }
- },
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -857,6 +865,15 @@
"System.Runtime.Extensions": "4.3.0"
}
},
+ "System.Security.AccessControl": {
+ "type": "Transitive",
+ "resolved": "5.0.0",
+ "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==",
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "5.0.0",
+ "System.Security.Principal.Windows": "5.0.0"
+ }
+ },
"System.Security.Cryptography.Algorithms": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1001,6 +1018,11 @@
"runtime.native.System.Security.Cryptography.OpenSsl": "4.3.0"
}
},
+ "System.Security.Principal.Windows": {
+ "type": "Transitive",
+ "resolved": "5.0.0",
+ "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA=="
+ },
"System.Text.Encoding": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -1013,11 +1035,11 @@
},
"System.Text.Encoding.CodePages": {
"type": "Transitive",
- "resolved": "4.5.0",
- "contentHash": "S0wEUiKcLvRlkFUXca8uio1UQ5bYQzYgOmOKtCqaBQC3GR9AJjh43otcM32IGsAyvadFTaAMw9Irm6dS4Evfng==",
+ "resolved": "4.5.1",
+ "contentHash": "4J2JQXbftjPMppIHJ7IC+VXQ9XfEagN92vZZNoG12i+zReYlim5dMoXFC1Zzg7tsnKDM7JPo5bYfFK4Jheq44w==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "2.0.0",
- "System.Runtime.CompilerServices.Unsafe": "4.5.0"
+ "Microsoft.NETCore.Platforms": "2.1.2",
+ "System.Runtime.CompilerServices.Unsafe": "4.5.2"
}
},
"System.Text.Encoding.Extensions": {
@@ -1129,6 +1151,28 @@
"System.Memory": "[4.5.5, )",
"System.Runtime": "[4.3.1, )"
}
+ },
+ "System.Diagnostics.DiagnosticSource": {
+ "type": "CentralTransitive",
+ "requested": "[7.0.0, )",
+ "resolved": "7.0.0",
+ "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw=="
+ },
+ "System.Memory": {
+ "type": "CentralTransitive",
+ "requested": "[4.5.5, )",
+ "resolved": "4.5.5",
+ "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
+ },
+ "System.Runtime": {
+ "type": "CentralTransitive",
+ "requested": "[4.3.1, )",
+ "resolved": "4.3.1",
+ "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==",
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "1.1.1",
+ "Microsoft.NETCore.Targets": "1.1.3"
+ }
}
}
}
diff --git a/src/Fantomas.Client.Tests/Fantomas.Client.Tests.fsproj b/src/Fantomas.Client.Tests/Fantomas.Client.Tests.fsproj
index a037b66aca..6776ff1eaf 100644
--- a/src/Fantomas.Client.Tests/Fantomas.Client.Tests.fsproj
+++ b/src/Fantomas.Client.Tests/Fantomas.Client.Tests.fsproj
@@ -13,11 +13,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Fantomas.Client.Tests/packages.lock.json b/src/Fantomas.Client.Tests/packages.lock.json
index 92aced40b2..02af24e1e4 100644
--- a/src/Fantomas.Client.Tests/packages.lock.json
+++ b/src/Fantomas.Client.Tests/packages.lock.json
@@ -1,12 +1,12 @@
{
- "version": 1,
+ "version": 2,
"dependencies": {
"net7.0": {
"CliWrap": {
"type": "Direct",
- "requested": "[3.6.0, )",
- "resolved": "3.6.0",
- "contentHash": "AY6LvRZOEYuAiuaWPLnIDddJUnpiPpiSvfoPwweEXI1orRNnsAwf6sOv9Tt0J4GFrlwejFF/INuR57iEKIh7bw=="
+ "requested": "[3.6.4, )",
+ "resolved": "3.6.4",
+ "contentHash": "KVGVZlR0GWgN3Xr88oZMSzYu38TXIogwLz588e6wku3mIfg6lPchxpYWtZSZfurpTY63ANF61xWp8EZF3jkN4g=="
},
"FSharp.Analyzers.Build": {
"type": "Direct",
@@ -37,12 +37,12 @@
},
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
- "requested": "[17.5.0, )",
- "resolved": "17.5.0",
- "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==",
+ "requested": "[17.8.0, )",
+ "resolved": "17.8.0",
+ "contentHash": "BmTYGbD/YuDHmApIENdoyN1jCk0Rj1fJB0+B/fVekyTdVidr91IlzhqzytiUgaEAzL1ZJcYCme0MeBMYvJVzvw==",
"dependencies": {
- "Microsoft.CodeCoverage": "17.5.0",
- "Microsoft.TestPlatform.TestHost": "17.5.0"
+ "Microsoft.CodeCoverage": "17.8.0",
+ "Microsoft.TestPlatform.TestHost": "17.8.0"
}
},
"NUnit": {
@@ -56,9 +56,9 @@
},
"NUnit3TestAdapter": {
"type": "Direct",
- "requested": "[4.4.2, )",
- "resolved": "4.4.2",
- "contentHash": "vA/iHYcR+LYw+pRWQugckC/zW2fXHaqMr2uA82NOBt8v4YK4wMJrQ7QC8XLc7PjetEZ96cPbBTWsDDtmQiRZTA=="
+ "requested": "[4.5.0, )",
+ "resolved": "4.5.0",
+ "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A=="
},
"MessagePack": {
"type": "Transitive",
@@ -87,8 +87,8 @@
},
"Microsoft.CodeCoverage": {
"type": "Transitive",
- "resolved": "17.5.0",
- "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig=="
+ "resolved": "17.8.0",
+ "contentHash": "KC8SXWbGIdoFVdlxKk9WHccm0llm9HypcHMLUUFabRiTS3SO2fQXNZfdiF3qkEdTJhbRrxhdRxjL4jbtwPq4Ew=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -102,19 +102,19 @@
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
- "resolved": "17.5.0",
- "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==",
+ "resolved": "17.8.0",
+ "contentHash": "AYy6vlpGMfz5kOFq99L93RGbqftW/8eQTqjT9iGXW6s9MRP3UdtY8idJ8rJcjeSja8A18IhIro5YnH3uv1nz4g==",
"dependencies": {
- "NuGet.Frameworks": "5.11.0",
+ "NuGet.Frameworks": "6.5.0",
"System.Reflection.Metadata": "1.6.0"
}
},
"Microsoft.TestPlatform.TestHost": {
"type": "Transitive",
- "resolved": "17.5.0",
- "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==",
+ "resolved": "17.8.0",
+ "contentHash": "9ivcl/7SGRmOT0YYrHQGohWiT5YCpkmy/UEzldfVisLm6QxbLaK3FAJqZXI34rnRLmqqDCeMQxKINwmKwAPiDw==",
"dependencies": {
- "Microsoft.TestPlatform.ObjectModel": "17.5.0",
+ "Microsoft.TestPlatform.ObjectModel": "17.8.0",
"Newtonsoft.Json": "13.0.1"
}
},
@@ -187,8 +187,8 @@
},
"NuGet.Frameworks": {
"type": "Transitive",
- "resolved": "5.11.0",
- "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q=="
+ "resolved": "6.5.0",
+ "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg=="
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
"type": "Transitive",
@@ -288,32 +288,6 @@
"resolved": "4.3.2",
"contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg=="
},
- "SemanticVersioning": {
- "type": "Transitive",
- "resolved": "2.0.2",
- "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA=="
- },
- "StreamJsonRpc": {
- "type": "Transitive",
- "resolved": "2.8.28",
- "contentHash": "i2hKUXJSLEoWpPqQNyISqLDqmFHMiyasjTC/PrrHNWhQyauFeVoebSct3E4OTUzRC1DYjVJ9AMiVbp/uVYLnjQ==",
- "dependencies": {
- "MessagePack": "2.2.85",
- "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
- "Microsoft.VisualStudio.Threading": "16.9.60",
- "Nerdbank.Streams": "2.6.81",
- "Newtonsoft.Json": "12.0.2",
- "System.Collections.Immutable": "5.0.0",
- "System.Diagnostics.DiagnosticSource": "5.0.1",
- "System.IO.Pipelines": "5.0.1",
- "System.Memory": "4.5.4",
- "System.Net.Http": "4.3.4",
- "System.Net.WebSockets": "4.3.0",
- "System.Reflection.Emit": "4.7.0",
- "System.Threading.Tasks.Dataflow": "5.0.0",
- "System.Threading.Tasks.Extensions": "4.5.4"
- }
- },
"System.Collections": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -356,11 +330,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "5.0.1",
- "contentHash": "uXQEYqav2V3zP6OwkOKtLv+qIi6z3m1hsGyKwXX7ZA7htT4shoVccGxnJ9kVRFPNAsi1ArZTq2oh7WOto6GbkQ=="
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -457,11 +426,6 @@
"System.Runtime.Extensions": "4.3.0"
}
},
- "System.Memory": {
- "type": "Transitive",
- "resolved": "4.5.4",
- "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw=="
- },
"System.Net.Http": {
"type": "Transitive",
"resolved": "4.3.4",
@@ -566,15 +530,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Runtime": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0"
- }
- },
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "4.7.1",
@@ -828,6 +783,56 @@
"SemanticVersioning": "[2.0.2, )",
"StreamJsonRpc": "[2.8.28, )"
}
+ },
+ "SemanticVersioning": {
+ "type": "CentralTransitive",
+ "requested": "[2.0.2, )",
+ "resolved": "2.0.2",
+ "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA=="
+ },
+ "StreamJsonRpc": {
+ "type": "CentralTransitive",
+ "requested": "[2.8.28, )",
+ "resolved": "2.8.28",
+ "contentHash": "i2hKUXJSLEoWpPqQNyISqLDqmFHMiyasjTC/PrrHNWhQyauFeVoebSct3E4OTUzRC1DYjVJ9AMiVbp/uVYLnjQ==",
+ "dependencies": {
+ "MessagePack": "2.2.85",
+ "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+ "Microsoft.VisualStudio.Threading": "16.9.60",
+ "Nerdbank.Streams": "2.6.81",
+ "Newtonsoft.Json": "12.0.2",
+ "System.Collections.Immutable": "5.0.0",
+ "System.Diagnostics.DiagnosticSource": "5.0.1",
+ "System.IO.Pipelines": "5.0.1",
+ "System.Memory": "4.5.4",
+ "System.Net.Http": "4.3.4",
+ "System.Net.WebSockets": "4.3.0",
+ "System.Reflection.Emit": "4.7.0",
+ "System.Threading.Tasks.Dataflow": "5.0.0",
+ "System.Threading.Tasks.Extensions": "4.5.4"
+ }
+ },
+ "System.Diagnostics.DiagnosticSource": {
+ "type": "CentralTransitive",
+ "requested": "[7.0.0, )",
+ "resolved": "5.0.1",
+ "contentHash": "uXQEYqav2V3zP6OwkOKtLv+qIi6z3m1hsGyKwXX7ZA7htT4shoVccGxnJ9kVRFPNAsi1ArZTq2oh7WOto6GbkQ=="
+ },
+ "System.Memory": {
+ "type": "CentralTransitive",
+ "requested": "[4.5.5, )",
+ "resolved": "4.5.4",
+ "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw=="
+ },
+ "System.Runtime": {
+ "type": "CentralTransitive",
+ "requested": "[4.3.1, )",
+ "resolved": "4.3.0",
+ "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "1.1.0",
+ "Microsoft.NETCore.Targets": "1.1.0"
+ }
}
}
}
diff --git a/src/Fantomas.Client/Fantomas.Client.fsproj b/src/Fantomas.Client/Fantomas.Client.fsproj
index 1461222f09..02c6aef7ee 100644
--- a/src/Fantomas.Client/Fantomas.Client.fsproj
+++ b/src/Fantomas.Client/Fantomas.Client.fsproj
@@ -18,8 +18,8 @@
-
-
-
+
+
+
\ No newline at end of file
diff --git a/src/Fantomas.Client/packages.lock.json b/src/Fantomas.Client/packages.lock.json
index d032b37c64..492e60534b 100644
--- a/src/Fantomas.Client/packages.lock.json
+++ b/src/Fantomas.Client/packages.lock.json
@@ -1,5 +1,5 @@
{
- "version": 1,
+ "version": 2,
"dependencies": {
".NETStandard,Version=v2.0": {
"DotNet.ReproducibleBuilds": {
@@ -377,15 +377,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "5.0.1",
- "contentHash": "uXQEYqav2V3zP6OwkOKtLv+qIi6z3m1hsGyKwXX7ZA7htT4shoVccGxnJ9kVRFPNAsi1ArZTq2oh7WOto6GbkQ==",
- "dependencies": {
- "System.Memory": "4.5.4",
- "System.Runtime.CompilerServices.Unsafe": "5.0.0"
- }
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -487,16 +478,6 @@
"System.Runtime.Extensions": "4.3.0"
}
},
- "System.Memory": {
- "type": "Transitive",
- "resolved": "4.5.4",
- "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
- "dependencies": {
- "System.Buffers": "4.5.1",
- "System.Numerics.Vectors": "4.4.0",
- "System.Runtime.CompilerServices.Unsafe": "4.5.3"
- }
- },
"System.Net.Http": {
"type": "Transitive",
"resolved": "4.3.4",
@@ -612,15 +593,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Runtime": {
- "type": "Transitive",
- "resolved": "4.3.0",
- "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.0",
- "Microsoft.NETCore.Targets": "1.1.0"
- }
- },
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "5.0.0",
@@ -868,6 +840,37 @@
"dependencies": {
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
}
+ },
+ "System.Diagnostics.DiagnosticSource": {
+ "type": "CentralTransitive",
+ "requested": "[7.0.0, )",
+ "resolved": "5.0.1",
+ "contentHash": "uXQEYqav2V3zP6OwkOKtLv+qIi6z3m1hsGyKwXX7ZA7htT4shoVccGxnJ9kVRFPNAsi1ArZTq2oh7WOto6GbkQ==",
+ "dependencies": {
+ "System.Memory": "4.5.4",
+ "System.Runtime.CompilerServices.Unsafe": "5.0.0"
+ }
+ },
+ "System.Memory": {
+ "type": "CentralTransitive",
+ "requested": "[4.5.5, )",
+ "resolved": "4.5.4",
+ "contentHash": "1MbJTHS1lZ4bS4FmsJjnuGJOu88ZzTT2rLvrhW7Ygic+pC0NWA+3hgAen0HRdsocuQXCkUTdFn9yHJJhsijDXw==",
+ "dependencies": {
+ "System.Buffers": "4.5.1",
+ "System.Numerics.Vectors": "4.4.0",
+ "System.Runtime.CompilerServices.Unsafe": "4.5.3"
+ }
+ },
+ "System.Runtime": {
+ "type": "CentralTransitive",
+ "requested": "[4.3.1, )",
+ "resolved": "4.3.0",
+ "contentHash": "JufQi0vPQ0xGnAczR13AUFglDyVYt4Kqnz1AZaiKZ5+GICq0/1MH/mO/eAJHt/mHW1zjKBJd7kV26SrxddAhiw==",
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "1.1.0",
+ "Microsoft.NETCore.Targets": "1.1.0"
+ }
}
}
}
diff --git a/src/Fantomas.Core.Tests/Fantomas.Core.Tests.fsproj b/src/Fantomas.Core.Tests/Fantomas.Core.Tests.fsproj
index 7090b89a62..fc1f54d822 100644
--- a/src/Fantomas.Core.Tests/Fantomas.Core.Tests.fsproj
+++ b/src/Fantomas.Core.Tests/Fantomas.Core.Tests.fsproj
@@ -137,12 +137,12 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Fantomas.Core.Tests/packages.lock.json b/src/Fantomas.Core.Tests/packages.lock.json
index f6e9017873..b9e978ee1e 100644
--- a/src/Fantomas.Core.Tests/packages.lock.json
+++ b/src/Fantomas.Core.Tests/packages.lock.json
@@ -1,5 +1,5 @@
{
- "version": 1,
+ "version": 2,
"dependencies": {
"net7.0": {
"FsCheck": {
@@ -51,12 +51,12 @@
},
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
- "requested": "[17.5.0, )",
- "resolved": "17.5.0",
- "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==",
+ "requested": "[17.8.0, )",
+ "resolved": "17.8.0",
+ "contentHash": "BmTYGbD/YuDHmApIENdoyN1jCk0Rj1fJB0+B/fVekyTdVidr91IlzhqzytiUgaEAzL1ZJcYCme0MeBMYvJVzvw==",
"dependencies": {
- "Microsoft.CodeCoverage": "17.5.0",
- "Microsoft.TestPlatform.TestHost": "17.5.0"
+ "Microsoft.CodeCoverage": "17.8.0",
+ "Microsoft.TestPlatform.TestHost": "17.8.0"
}
},
"NUnit": {
@@ -70,23 +70,23 @@
},
"NUnit3TestAdapter": {
"type": "Direct",
- "requested": "[4.4.2, )",
- "resolved": "4.4.2",
- "contentHash": "vA/iHYcR+LYw+pRWQugckC/zW2fXHaqMr2uA82NOBt8v4YK4wMJrQ7QC8XLc7PjetEZ96cPbBTWsDDtmQiRZTA=="
+ "requested": "[4.5.0, )",
+ "resolved": "4.5.0",
+ "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A=="
},
"System.IO.Abstractions.TestingHelpers": {
"type": "Direct",
- "requested": "[17.2.3, )",
- "resolved": "17.2.3",
- "contentHash": "tkXvQbsfOIfeoGso+WptCuouFLiWt3EU8s0D8poqIVz1BJOOszkPuFbFgP2HUTJ9bp5n1HH89eFHILo6Oz5XUw==",
+ "requested": "[20.0.4, )",
+ "resolved": "20.0.4",
+ "contentHash": "Dp6gPoqJ7i8dRGubfxzA219fFCtkam9BgSmuIT+fQcFPKkW6vx9PuLTSELsNq+gRoEAzxGbWjsT/3WslfcmRfg==",
"dependencies": {
- "System.IO.Abstractions": "17.2.3"
+ "TestableIO.System.IO.Abstractions.TestingHelpers": "20.0.4"
}
},
"Microsoft.CodeCoverage": {
"type": "Transitive",
- "resolved": "17.5.0",
- "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig=="
+ "resolved": "17.8.0",
+ "contentHash": "KC8SXWbGIdoFVdlxKk9WHccm0llm9HypcHMLUUFabRiTS3SO2fQXNZfdiF3qkEdTJhbRrxhdRxjL4jbtwPq4Ew=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -100,19 +100,19 @@
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
- "resolved": "17.5.0",
- "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==",
+ "resolved": "17.8.0",
+ "contentHash": "AYy6vlpGMfz5kOFq99L93RGbqftW/8eQTqjT9iGXW6s9MRP3UdtY8idJ8rJcjeSja8A18IhIro5YnH3uv1nz4g==",
"dependencies": {
- "NuGet.Frameworks": "5.11.0",
+ "NuGet.Frameworks": "6.5.0",
"System.Reflection.Metadata": "1.6.0"
}
},
"Microsoft.TestPlatform.TestHost": {
"type": "Transitive",
- "resolved": "17.5.0",
- "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==",
+ "resolved": "17.8.0",
+ "contentHash": "9ivcl/7SGRmOT0YYrHQGohWiT5YCpkmy/UEzldfVisLm6QxbLaK3FAJqZXI34rnRLmqqDCeMQxKINwmKwAPiDw==",
"dependencies": {
- "Microsoft.TestPlatform.ObjectModel": "17.5.0",
+ "Microsoft.TestPlatform.ObjectModel": "17.8.0",
"Newtonsoft.Json": "13.0.1"
}
},
@@ -131,36 +131,34 @@
},
"NuGet.Frameworks": {
"type": "Transitive",
- "resolved": "5.11.0",
- "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q=="
+ "resolved": "6.5.0",
+ "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg=="
},
- "System.Diagnostics.DiagnosticSource": {
+ "System.Reflection.Metadata": {
"type": "Transitive",
- "resolved": "7.0.0",
- "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw=="
+ "resolved": "1.6.0",
+ "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
},
- "System.IO.Abstractions": {
+ "TestableIO.System.IO.Abstractions": {
"type": "Transitive",
- "resolved": "17.2.3",
- "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ=="
+ "resolved": "20.0.4",
+ "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA=="
},
- "System.Memory": {
+ "TestableIO.System.IO.Abstractions.TestingHelpers": {
"type": "Transitive",
- "resolved": "4.5.5",
- "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
- },
- "System.Reflection.Metadata": {
- "type": "Transitive",
- "resolved": "1.6.0",
- "contentHash": "COC1aiAJjCoA5GBF+QKL2uLqEBew4JsCkQmoHKbN3TlOZKa2fKLz5CpiRQKDz0RsAOEGsVKqOD5bomsXq/4STQ=="
+ "resolved": "20.0.4",
+ "contentHash": "O8YeM+jsunyWt4ch93QnvWmMN/uguU0uX2VvDEvlltOxxHfCOuy0jG9m9p/lys52orlbpRa/Rl6mMXwoK2tdcA==",
+ "dependencies": {
+ "TestableIO.System.IO.Abstractions": "20.0.4",
+ "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4"
+ }
},
- "System.Runtime": {
+ "TestableIO.System.IO.Abstractions.Wrappers": {
"type": "Transitive",
- "resolved": "4.3.1",
- "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==",
+ "resolved": "20.0.4",
+ "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==",
"dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.1",
- "Microsoft.NETCore.Targets": "1.1.3"
+ "TestableIO.System.IO.Abstractions": "20.0.4"
}
},
"fantomas.core": {
@@ -178,6 +176,28 @@
"System.Memory": "[4.5.5, )",
"System.Runtime": "[4.3.1, )"
}
+ },
+ "System.Diagnostics.DiagnosticSource": {
+ "type": "CentralTransitive",
+ "requested": "[7.0.0, )",
+ "resolved": "7.0.0",
+ "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw=="
+ },
+ "System.Memory": {
+ "type": "CentralTransitive",
+ "requested": "[4.5.5, )",
+ "resolved": "4.5.5",
+ "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
+ },
+ "System.Runtime": {
+ "type": "CentralTransitive",
+ "requested": "[4.3.1, )",
+ "resolved": "4.3.1",
+ "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==",
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "1.1.1",
+ "Microsoft.NETCore.Targets": "1.1.3"
+ }
}
}
}
diff --git a/src/Fantomas.Core/Fantomas.Core.fsproj b/src/Fantomas.Core/Fantomas.Core.fsproj
index 7c33de1d39..9772cd28c2 100644
--- a/src/Fantomas.Core/Fantomas.Core.fsproj
+++ b/src/Fantomas.Core/Fantomas.Core.fsproj
@@ -41,7 +41,7 @@
-
+
diff --git a/src/Fantomas.Core/packages.lock.json b/src/Fantomas.Core/packages.lock.json
index 548930d5c2..40a1538138 100644
--- a/src/Fantomas.Core/packages.lock.json
+++ b/src/Fantomas.Core/packages.lock.json
@@ -1,5 +1,5 @@
{
- "version": 1,
+ "version": 2,
"dependencies": {
".NETStandard,Version=v2.0": {
"DotNet.ReproducibleBuilds": {
@@ -117,8 +117,28 @@
"resolved": "4.5.1",
"contentHash": "Rw7ijyl1qqRS0YQD/WycNst8hUUMgrMH4FCn1nNm27M4VxchZ1js3fVjQaANHO5f3sN4isvP4a+Met9Y4YomAg=="
},
- "System.Diagnostics.DiagnosticSource": {
+ "System.Numerics.Vectors": {
"type": "Transitive",
+ "resolved": "4.4.0",
+ "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
+ },
+ "System.Runtime.CompilerServices.Unsafe": {
+ "type": "Transitive",
+ "resolved": "6.0.0",
+ "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
+ },
+ "fantomas.fcs": {
+ "type": "Project",
+ "dependencies": {
+ "FSharp.Core": "[6.0.1, )",
+ "System.Diagnostics.DiagnosticSource": "[7.0.0, )",
+ "System.Memory": "[4.5.5, )",
+ "System.Runtime": "[4.3.1, )"
+ }
+ },
+ "System.Diagnostics.DiagnosticSource": {
+ "type": "CentralTransitive",
+ "requested": "[7.0.0, )",
"resolved": "7.0.0",
"contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==",
"dependencies": {
@@ -127,7 +147,8 @@
}
},
"System.Memory": {
- "type": "Transitive",
+ "type": "CentralTransitive",
+ "requested": "[4.5.5, )",
"resolved": "4.5.5",
"contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw==",
"dependencies": {
@@ -136,33 +157,15 @@
"System.Runtime.CompilerServices.Unsafe": "4.5.3"
}
},
- "System.Numerics.Vectors": {
- "type": "Transitive",
- "resolved": "4.4.0",
- "contentHash": "UiLzLW+Lw6HLed1Hcg+8jSRttrbuXv7DANVj0DkL9g6EnnzbL75EB7EWsw5uRbhxd/4YdG8li5XizGWepmG3PQ=="
- },
"System.Runtime": {
- "type": "Transitive",
+ "type": "CentralTransitive",
+ "requested": "[4.3.1, )",
"resolved": "4.3.1",
"contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==",
"dependencies": {
"Microsoft.NETCore.Platforms": "1.1.1",
"Microsoft.NETCore.Targets": "1.1.3"
}
- },
- "System.Runtime.CompilerServices.Unsafe": {
- "type": "Transitive",
- "resolved": "6.0.0",
- "contentHash": "/iUeP3tq1S0XdNNoMz5C9twLSrM/TH+qElHkXWaPvuNOt+99G75NrV0OS2EqHx5wMN7popYjpc8oTjC1y16DLg=="
- },
- "fantomas.fcs": {
- "type": "Project",
- "dependencies": {
- "FSharp.Core": "[6.0.1, )",
- "System.Diagnostics.DiagnosticSource": "[7.0.0, )",
- "System.Memory": "[4.5.5, )",
- "System.Runtime": "[4.3.1, )"
- }
}
}
}
diff --git a/src/Fantomas.FCS/Fantomas.FCS.fsproj b/src/Fantomas.FCS/Fantomas.FCS.fsproj
index fa59b89ff5..14380a72fd 100644
--- a/src/Fantomas.FCS/Fantomas.FCS.fsproj
+++ b/src/Fantomas.FCS/Fantomas.FCS.fsproj
@@ -302,11 +302,11 @@
-
-
-
-
-
+
+
+
+
+
diff --git a/src/Fantomas.FCS/packages.lock.json b/src/Fantomas.FCS/packages.lock.json
index 2b55c551d9..02675f42e2 100644
--- a/src/Fantomas.FCS/packages.lock.json
+++ b/src/Fantomas.FCS/packages.lock.json
@@ -1,5 +1,5 @@
{
- "version": 1,
+ "version": 2,
"dependencies": {
".NETStandard,Version=v2.0": {
"DotNet.ReproducibleBuilds": {
diff --git a/src/Fantomas.Tests/Fantomas.Tests.fsproj b/src/Fantomas.Tests/Fantomas.Tests.fsproj
index 1fe2c0bc15..ff15063af2 100644
--- a/src/Fantomas.Tests/Fantomas.Tests.fsproj
+++ b/src/Fantomas.Tests/Fantomas.Tests.fsproj
@@ -31,12 +31,12 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Fantomas.Tests/packages.lock.json b/src/Fantomas.Tests/packages.lock.json
index e9c216e1a0..bffbd49a1c 100644
--- a/src/Fantomas.Tests/packages.lock.json
+++ b/src/Fantomas.Tests/packages.lock.json
@@ -1,5 +1,5 @@
{
- "version": 1,
+ "version": 2,
"dependencies": {
"net7.0": {
"FsCheck": {
@@ -51,12 +51,12 @@
},
"Microsoft.NET.Test.Sdk": {
"type": "Direct",
- "requested": "[17.5.0, )",
- "resolved": "17.5.0",
- "contentHash": "IJ4eSPcsRbwbAZehh1M9KgejSy0u3d0wAdkJytfCh67zOaCl5U3ltruUEe15MqirdRqGmm/ngbjeaVeGapSZxg==",
+ "requested": "[17.8.0, )",
+ "resolved": "17.8.0",
+ "contentHash": "BmTYGbD/YuDHmApIENdoyN1jCk0Rj1fJB0+B/fVekyTdVidr91IlzhqzytiUgaEAzL1ZJcYCme0MeBMYvJVzvw==",
"dependencies": {
- "Microsoft.CodeCoverage": "17.5.0",
- "Microsoft.TestPlatform.TestHost": "17.5.0"
+ "Microsoft.CodeCoverage": "17.8.0",
+ "Microsoft.TestPlatform.TestHost": "17.8.0"
}
},
"NUnit": {
@@ -70,33 +70,19 @@
},
"NUnit3TestAdapter": {
"type": "Direct",
- "requested": "[4.4.2, )",
- "resolved": "4.4.2",
- "contentHash": "vA/iHYcR+LYw+pRWQugckC/zW2fXHaqMr2uA82NOBt8v4YK4wMJrQ7QC8XLc7PjetEZ96cPbBTWsDDtmQiRZTA=="
+ "requested": "[4.5.0, )",
+ "resolved": "4.5.0",
+ "contentHash": "s8JpqTe9bI2f49Pfr3dFRfoVSuFQyraTj68c3XXjIS/MRGvvkLnrg6RLqnTjdShX+AdFUCCU/4Xex58AdUfs6A=="
},
"System.IO.Abstractions.TestingHelpers": {
"type": "Direct",
- "requested": "[17.2.3, )",
- "resolved": "17.2.3",
- "contentHash": "tkXvQbsfOIfeoGso+WptCuouFLiWt3EU8s0D8poqIVz1BJOOszkPuFbFgP2HUTJ9bp5n1HH89eFHILo6Oz5XUw==",
+ "requested": "[20.0.4, )",
+ "resolved": "20.0.4",
+ "contentHash": "Dp6gPoqJ7i8dRGubfxzA219fFCtkam9BgSmuIT+fQcFPKkW6vx9PuLTSELsNq+gRoEAzxGbWjsT/3WslfcmRfg==",
"dependencies": {
- "System.IO.Abstractions": "17.2.3"
+ "TestableIO.System.IO.Abstractions.TestingHelpers": "20.0.4"
}
},
- "Argu": {
- "type": "Transitive",
- "resolved": "6.1.1",
- "contentHash": "5SBLYihaZ6/YNpRU+0v0QLsCk7ABmOWNOUwkXVUql2w7kJ6Hi4AFhgIv5XLTtxTid5/xrJAL+PglQkNcjANCJg==",
- "dependencies": {
- "FSharp.Core": "4.3.2",
- "System.Configuration.ConfigurationManager": "4.4.0"
- }
- },
- "editorconfig": {
- "type": "Transitive",
- "resolved": "0.14.0",
- "contentHash": "emt1KlBtTsTSHWeLnlD1grQYN991wlzIh8t0/HF8ambYTLE8v25sPU9q2eu3sNj/Za7Ij6a0MW00lDGTsphEhQ=="
- },
"Fable.Core": {
"type": "Transitive",
"resolved": "3.0.0",
@@ -105,11 +91,6 @@
"FSharp.Core": "4.5.2"
}
},
- "Ignore": {
- "type": "Transitive",
- "resolved": "0.1.46",
- "contentHash": "pmSSh25tuSY7a0Iqcs6TRGGZut8SGogNUlsH7g8E3YY9kLu+qOMIpqa2h26+Q4V6yVp71vQbzqrYENuVecKyxQ=="
- },
"MessagePack": {
"type": "Transitive",
"resolved": "2.2.85",
@@ -137,8 +118,8 @@
},
"Microsoft.CodeCoverage": {
"type": "Transitive",
- "resolved": "17.5.0",
- "contentHash": "6FQo0O6LKDqbCiIgVQhJAf810HSjFlOj7FunWaeOGDKxy8DAbpHzPk4SfBTXz9ytaaceuIIeR6hZgplt09m+ig=="
+ "resolved": "17.8.0",
+ "contentHash": "KC8SXWbGIdoFVdlxKk9WHccm0llm9HypcHMLUUFabRiTS3SO2fQXNZfdiF3qkEdTJhbRrxhdRxjL4jbtwPq4Ew=="
},
"Microsoft.NETCore.Platforms": {
"type": "Transitive",
@@ -152,19 +133,19 @@
},
"Microsoft.TestPlatform.ObjectModel": {
"type": "Transitive",
- "resolved": "17.5.0",
- "contentHash": "QwiBJcC/oEA1kojOaB0uPWOIo4i6BYuTBBYJVhUvmXkyYqZ2Ut/VZfgi+enf8LF8J4sjO98oRRFt39MiRorcIw==",
+ "resolved": "17.8.0",
+ "contentHash": "AYy6vlpGMfz5kOFq99L93RGbqftW/8eQTqjT9iGXW6s9MRP3UdtY8idJ8rJcjeSja8A18IhIro5YnH3uv1nz4g==",
"dependencies": {
- "NuGet.Frameworks": "5.11.0",
+ "NuGet.Frameworks": "6.5.0",
"System.Reflection.Metadata": "1.6.0"
}
},
"Microsoft.TestPlatform.TestHost": {
"type": "Transitive",
- "resolved": "17.5.0",
- "contentHash": "X86aikwp9d4SDcBChwzQYZihTPGEtMdDk+9t64emAl7N0Tq+OmlLAoW+Rs+2FB2k6QdUicSlT4QLO2xABRokaw==",
+ "resolved": "17.8.0",
+ "contentHash": "9ivcl/7SGRmOT0YYrHQGohWiT5YCpkmy/UEzldfVisLm6QxbLaK3FAJqZXI34rnRLmqqDCeMQxKINwmKwAPiDw==",
"dependencies": {
- "Microsoft.TestPlatform.ObjectModel": "17.5.0",
+ "Microsoft.TestPlatform.ObjectModel": "17.8.0",
"Newtonsoft.Json": "13.0.1"
}
},
@@ -237,8 +218,8 @@
},
"NuGet.Frameworks": {
"type": "Transitive",
- "resolved": "5.11.0",
- "contentHash": "eaiXkUjC4NPcquGWzAGMXjuxvLwc6XGKMptSyOGQeT0X70BUZObuybJFZLA0OfTdueLd3US23NBPTBb6iF3V1Q=="
+ "resolved": "6.5.0",
+ "contentHash": "QWINE2x3MbTODsWT1Gh71GaGb5icBz4chS8VYvTgsBnsi8esgN6wtHhydd7fvToWECYGq7T4cgBBDiKD/363fg=="
},
"runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl": {
"type": "Transitive",
@@ -338,61 +319,6 @@
"resolved": "4.3.2",
"contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg=="
},
- "SemanticVersioning": {
- "type": "Transitive",
- "resolved": "2.0.2",
- "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA=="
- },
- "Serilog": {
- "type": "Transitive",
- "resolved": "2.12.0",
- "contentHash": "xaiJLIdu6rYMKfQMYUZgTy8YK7SMZjB4Yk50C/u//Z4OsvxkUfSPJy4nknfvwAC34yr13q7kcyh4grbwhSxyZg=="
- },
- "Serilog.Sinks.Console": {
- "type": "Transitive",
- "resolved": "4.1.0",
- "contentHash": "K6N5q+5fetjnJPvCmkWOpJ/V8IEIoMIB1s86OzBrbxwTyHxdx3pmz4H+8+O/Dc/ftUX12DM1aynx/dDowkwzqg==",
- "dependencies": {
- "Serilog": "2.10.0"
- }
- },
- "SerilogTraceListener": {
- "type": "Transitive",
- "resolved": "3.2.1-dev-00011",
- "contentHash": "Lcd96moPFhTzFOJR+EIxu0PSzZPPoX1BGNfpm7ArJ4/3MnMw3iTblEJBn8EpcSzS66DJyiy+WaXVkE7fuHhU3A==",
- "dependencies": {
- "Serilog": "2.8.0"
- }
- },
- "Spectre.Console": {
- "type": "Transitive",
- "resolved": "0.46.1-preview.0.6",
- "contentHash": "hJRBORvRHxxD3SjhnV7h0E6SY22iJVoP7oLtKz/YhVlNarMVOWe62qjQrk6+IF8M4D16Y+PC+D7C4W1rRLUCIg==",
- "dependencies": {
- "System.Memory": "4.5.5"
- }
- },
- "StreamJsonRpc": {
- "type": "Transitive",
- "resolved": "2.8.28",
- "contentHash": "i2hKUXJSLEoWpPqQNyISqLDqmFHMiyasjTC/PrrHNWhQyauFeVoebSct3E4OTUzRC1DYjVJ9AMiVbp/uVYLnjQ==",
- "dependencies": {
- "MessagePack": "2.2.85",
- "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
- "Microsoft.VisualStudio.Threading": "16.9.60",
- "Nerdbank.Streams": "2.6.81",
- "Newtonsoft.Json": "12.0.2",
- "System.Collections.Immutable": "5.0.0",
- "System.Diagnostics.DiagnosticSource": "5.0.1",
- "System.IO.Pipelines": "5.0.1",
- "System.Memory": "4.5.4",
- "System.Net.Http": "4.3.4",
- "System.Net.WebSockets": "4.3.0",
- "System.Reflection.Emit": "4.7.0",
- "System.Threading.Tasks.Dataflow": "5.0.0",
- "System.Threading.Tasks.Extensions": "4.5.4"
- }
- },
"System.Collections": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -443,11 +369,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "7.0.0",
- "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw=="
- },
"System.Diagnostics.Tracing": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -504,11 +425,6 @@
"System.Threading.Tasks": "4.3.0"
}
},
- "System.IO.Abstractions": {
- "type": "Transitive",
- "resolved": "17.2.3",
- "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ=="
- },
"System.IO.FileSystem": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -549,11 +465,6 @@
"System.Runtime.Extensions": "4.3.0"
}
},
- "System.Memory": {
- "type": "Transitive",
- "resolved": "4.5.5",
- "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
- },
"System.Net.Http": {
"type": "Transitive",
"resolved": "4.3.4",
@@ -658,15 +569,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Runtime": {
- "type": "Transitive",
- "resolved": "4.3.1",
- "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.1",
- "Microsoft.NETCore.Targets": "1.1.3"
- }
- },
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "4.7.1",
@@ -918,14 +820,26 @@
"resolved": "4.5.4",
"contentHash": "zteT+G8xuGu6mS+mzDzYXbzS7rd3K6Fjb9RiZlYlJPam2/hU7JCBZBVEcywNuR+oZ1ncTvc/cq0faRr3P01OVg=="
},
- "Thoth.Json.Net": {
+ "TestableIO.System.IO.Abstractions": {
"type": "Transitive",
- "resolved": "8.0.0",
- "contentHash": "C/b+8g/xUTJTn7pbKC4bMAOy2tyolXAuHTXguT5TNzDKQ6sjnUfFa9B81fTt9PuUOdWFLyRKlXASuFhSQciJGQ==",
+ "resolved": "20.0.4",
+ "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA=="
+ },
+ "TestableIO.System.IO.Abstractions.TestingHelpers": {
+ "type": "Transitive",
+ "resolved": "20.0.4",
+ "contentHash": "O8YeM+jsunyWt4ch93QnvWmMN/uguU0uX2VvDEvlltOxxHfCOuy0jG9m9p/lys52orlbpRa/Rl6mMXwoK2tdcA==",
"dependencies": {
- "FSharp.Core": "4.7.2",
- "Fable.Core": "[3.0.0, 4.0.0)",
- "Newtonsoft.Json": "11.0.2"
+ "TestableIO.System.IO.Abstractions": "20.0.4",
+ "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4"
+ }
+ },
+ "TestableIO.System.IO.Abstractions.Wrappers": {
+ "type": "Transitive",
+ "resolved": "20.0.4",
+ "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==",
+ "dependencies": {
+ "TestableIO.System.IO.Abstractions": "20.0.4"
}
},
"fantomas": {
@@ -935,15 +849,15 @@
"FSharp.Core": "[6.0.1, )",
"Fantomas.Client": "[1.0.0, )",
"Fantomas.Core": "[1.0.0, )",
- "Ignore": "[0.1.46, )",
- "Serilog": "[2.12.0, )",
- "Serilog.Sinks.Console": "[4.1.0, )",
+ "Ignore": "[0.1.50, )",
+ "Serilog": "[3.1.1, )",
+ "Serilog.Sinks.Console": "[5.0.1, )",
"SerilogTraceListener": "[3.2.1-dev-00011, )",
- "Spectre.Console": "[0.46.1-preview.0.6, )",
+ "Spectre.Console": "[0.48.0, )",
"StreamJsonRpc": "[2.8.28, )",
- "System.IO.Abstractions": "[17.2.3, )",
+ "System.IO.Abstractions": "[20.0.4, )",
"Thoth.Json.Net": "[8.0.0, )",
- "editorconfig": "[0.14.0, )"
+ "editorconfig": "[0.15.0, )"
}
},
"fantomas.client": {
@@ -969,6 +883,132 @@
"System.Memory": "[4.5.5, )",
"System.Runtime": "[4.3.1, )"
}
+ },
+ "Argu": {
+ "type": "CentralTransitive",
+ "requested": "[6.1.1, )",
+ "resolved": "6.1.1",
+ "contentHash": "5SBLYihaZ6/YNpRU+0v0QLsCk7ABmOWNOUwkXVUql2w7kJ6Hi4AFhgIv5XLTtxTid5/xrJAL+PglQkNcjANCJg==",
+ "dependencies": {
+ "FSharp.Core": "4.3.2",
+ "System.Configuration.ConfigurationManager": "4.4.0"
+ }
+ },
+ "editorconfig": {
+ "type": "CentralTransitive",
+ "requested": "[0.15.0, )",
+ "resolved": "0.15.0",
+ "contentHash": "NuUxFbycSCOhl0WzmNZ8ksSMrTHBFzTASkil+IOqXpqTXszokKjy6ihxMdjArGaC+AaLLq4nxfGVFLi6KWyFJg=="
+ },
+ "Ignore": {
+ "type": "CentralTransitive",
+ "requested": "[0.1.50, )",
+ "resolved": "0.1.50",
+ "contentHash": "nr7/KaY5KP9QvCEf478w1k9Yz+dXQZKLEAsjfhIjuneScmyLvMKoItPL6OfkNODeCrINtHEBt8A7q7yETS1PQQ=="
+ },
+ "SemanticVersioning": {
+ "type": "CentralTransitive",
+ "requested": "[2.0.2, )",
+ "resolved": "2.0.2",
+ "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA=="
+ },
+ "Serilog": {
+ "type": "CentralTransitive",
+ "requested": "[3.1.1, )",
+ "resolved": "3.1.1",
+ "contentHash": "P6G4/4Kt9bT635bhuwdXlJ2SCqqn2nhh4gqFqQueCOr9bK/e7W9ll/IoX1Ter948cV2Z/5+5v8pAfJYUISY03A=="
+ },
+ "Serilog.Sinks.Console": {
+ "type": "CentralTransitive",
+ "requested": "[5.0.1, )",
+ "resolved": "5.0.1",
+ "contentHash": "6Jt8jl9y2ey8VV7nVEUAyjjyxjAQuvd5+qj4XYAT9CwcsvR70HHULGBeD+K2WCALFXf7CFsNQT4lON6qXcu2AA==",
+ "dependencies": {
+ "Serilog": "3.1.1"
+ }
+ },
+ "SerilogTraceListener": {
+ "type": "CentralTransitive",
+ "requested": "[3.2.1-dev-00011, )",
+ "resolved": "3.2.1-dev-00011",
+ "contentHash": "Lcd96moPFhTzFOJR+EIxu0PSzZPPoX1BGNfpm7ArJ4/3MnMw3iTblEJBn8EpcSzS66DJyiy+WaXVkE7fuHhU3A==",
+ "dependencies": {
+ "Serilog": "2.8.0"
+ }
+ },
+ "Spectre.Console": {
+ "type": "CentralTransitive",
+ "requested": "[0.48.0, )",
+ "resolved": "0.48.0",
+ "contentHash": "4Mc1UT7Azgtyb8FyNwK5FZmoZbKuT5PmY7ZwaKUytjD5kGFMNBACpOZTwYtkuY377YkYtZYBeDDTJUwTW86QXw==",
+ "dependencies": {
+ "System.Memory": "4.5.5"
+ }
+ },
+ "StreamJsonRpc": {
+ "type": "CentralTransitive",
+ "requested": "[2.8.28, )",
+ "resolved": "2.8.28",
+ "contentHash": "i2hKUXJSLEoWpPqQNyISqLDqmFHMiyasjTC/PrrHNWhQyauFeVoebSct3E4OTUzRC1DYjVJ9AMiVbp/uVYLnjQ==",
+ "dependencies": {
+ "MessagePack": "2.2.85",
+ "Microsoft.Bcl.AsyncInterfaces": "5.0.0",
+ "Microsoft.VisualStudio.Threading": "16.9.60",
+ "Nerdbank.Streams": "2.6.81",
+ "Newtonsoft.Json": "12.0.2",
+ "System.Collections.Immutable": "5.0.0",
+ "System.Diagnostics.DiagnosticSource": "5.0.1",
+ "System.IO.Pipelines": "5.0.1",
+ "System.Memory": "4.5.4",
+ "System.Net.Http": "4.3.4",
+ "System.Net.WebSockets": "4.3.0",
+ "System.Reflection.Emit": "4.7.0",
+ "System.Threading.Tasks.Dataflow": "5.0.0",
+ "System.Threading.Tasks.Extensions": "4.5.4"
+ }
+ },
+ "System.Diagnostics.DiagnosticSource": {
+ "type": "CentralTransitive",
+ "requested": "[7.0.0, )",
+ "resolved": "7.0.0",
+ "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw=="
+ },
+ "System.IO.Abstractions": {
+ "type": "CentralTransitive",
+ "requested": "[20.0.4, )",
+ "resolved": "20.0.4",
+ "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==",
+ "dependencies": {
+ "TestableIO.System.IO.Abstractions": "20.0.4",
+ "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4"
+ }
+ },
+ "System.Memory": {
+ "type": "CentralTransitive",
+ "requested": "[4.5.5, )",
+ "resolved": "4.5.5",
+ "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
+ },
+ "System.Runtime": {
+ "type": "CentralTransitive",
+ "requested": "[4.3.1, )",
+ "resolved": "4.3.1",
+ "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==",
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "1.1.1",
+ "Microsoft.NETCore.Targets": "1.1.3"
+ }
+ },
+ "Thoth.Json.Net": {
+ "type": "CentralTransitive",
+ "requested": "[8.0.0, )",
+ "resolved": "8.0.0",
+ "contentHash": "C/b+8g/xUTJTn7pbKC4bMAOy2tyolXAuHTXguT5TNzDKQ6sjnUfFa9B81fTt9PuUOdWFLyRKlXASuFhSQciJGQ==",
+ "dependencies": {
+ "FSharp.Core": "4.7.2",
+ "Fable.Core": "[3.0.0, 4.0.0)",
+ "Newtonsoft.Json": "11.0.2"
+ }
}
}
}
diff --git a/src/Fantomas/Fantomas.fsproj b/src/Fantomas/Fantomas.fsproj
index 34a5d5eaa4..6210ac75a7 100644
--- a/src/Fantomas/Fantomas.fsproj
+++ b/src/Fantomas/Fantomas.fsproj
@@ -34,16 +34,16 @@
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/Fantomas/IgnoreFile.fs b/src/Fantomas/IgnoreFile.fs
index e7897d445e..d5d653c7a5 100644
--- a/src/Fantomas/IgnoreFile.fs
+++ b/src/Fantomas/IgnoreFile.fs
@@ -39,8 +39,7 @@ module IgnoreFile =
None
else
let potentialFile =
- fs.Path.Combine(currentDirectory.FullName, IgnoreFileName)
- |> fs.FileInfo.FromFileName
+ fs.Path.Combine(currentDirectory.FullName, IgnoreFileName) |> fs.FileInfo.New
if potentialFile.Exists then
{ Location = potentialFile
@@ -49,7 +48,7 @@ module IgnoreFile =
else
walkUp currentDirectory.Parent
- walkUp (fs.FileInfo.FromFileName(filePath).Directory)
+ walkUp (fs.FileInfo.New(filePath).Directory)
let loadIgnoreList (fs: IFileSystem) (ignoreFilePath: string) : IsPathIgnored =
let lines = fs.File.ReadAllLines(ignoreFilePath)
diff --git a/src/Fantomas/packages.lock.json b/src/Fantomas/packages.lock.json
index 7ffb918c2f..83e686312c 100644
--- a/src/Fantomas/packages.lock.json
+++ b/src/Fantomas/packages.lock.json
@@ -1,5 +1,5 @@
{
- "version": 1,
+ "version": 2,
"dependencies": {
"net6.0": {
"Argu": {
@@ -26,9 +26,9 @@
},
"editorconfig": {
"type": "Direct",
- "requested": "[0.14.0, )",
- "resolved": "0.14.0",
- "contentHash": "emt1KlBtTsTSHWeLnlD1grQYN991wlzIh8t0/HF8ambYTLE8v25sPU9q2eu3sNj/Za7Ij6a0MW00lDGTsphEhQ=="
+ "requested": "[0.15.0, )",
+ "resolved": "0.15.0",
+ "contentHash": "NuUxFbycSCOhl0WzmNZ8ksSMrTHBFzTASkil+IOqXpqTXszokKjy6ihxMdjArGaC+AaLLq4nxfGVFLi6KWyFJg=="
},
"FSharp.Analyzers.Build": {
"type": "Direct",
@@ -53,9 +53,9 @@
},
"Ignore": {
"type": "Direct",
- "requested": "[0.1.46, )",
- "resolved": "0.1.46",
- "contentHash": "pmSSh25tuSY7a0Iqcs6TRGGZut8SGogNUlsH7g8E3YY9kLu+qOMIpqa2h26+Q4V6yVp71vQbzqrYENuVecKyxQ=="
+ "requested": "[0.1.50, )",
+ "resolved": "0.1.50",
+ "contentHash": "nr7/KaY5KP9QvCEf478w1k9Yz+dXQZKLEAsjfhIjuneScmyLvMKoItPL6OfkNODeCrINtHEBt8A7q7yETS1PQQ=="
},
"Ionide.Analyzers": {
"type": "Direct",
@@ -71,17 +71,17 @@
},
"Serilog": {
"type": "Direct",
- "requested": "[2.12.0, )",
- "resolved": "2.12.0",
- "contentHash": "xaiJLIdu6rYMKfQMYUZgTy8YK7SMZjB4Yk50C/u//Z4OsvxkUfSPJy4nknfvwAC34yr13q7kcyh4grbwhSxyZg=="
+ "requested": "[3.1.1, )",
+ "resolved": "3.1.1",
+ "contentHash": "P6G4/4Kt9bT635bhuwdXlJ2SCqqn2nhh4gqFqQueCOr9bK/e7W9ll/IoX1Ter948cV2Z/5+5v8pAfJYUISY03A=="
},
"Serilog.Sinks.Console": {
"type": "Direct",
- "requested": "[4.1.0, )",
- "resolved": "4.1.0",
- "contentHash": "K6N5q+5fetjnJPvCmkWOpJ/V8IEIoMIB1s86OzBrbxwTyHxdx3pmz4H+8+O/Dc/ftUX12DM1aynx/dDowkwzqg==",
+ "requested": "[5.0.1, )",
+ "resolved": "5.0.1",
+ "contentHash": "6Jt8jl9y2ey8VV7nVEUAyjjyxjAQuvd5+qj4XYAT9CwcsvR70HHULGBeD+K2WCALFXf7CFsNQT4lON6qXcu2AA==",
"dependencies": {
- "Serilog": "2.10.0"
+ "Serilog": "3.1.1"
}
},
"SerilogTraceListener": {
@@ -95,9 +95,9 @@
},
"Spectre.Console": {
"type": "Direct",
- "requested": "[0.46.1-preview.0.6, )",
- "resolved": "0.46.1-preview.0.6",
- "contentHash": "hJRBORvRHxxD3SjhnV7h0E6SY22iJVoP7oLtKz/YhVlNarMVOWe62qjQrk6+IF8M4D16Y+PC+D7C4W1rRLUCIg==",
+ "requested": "[0.48.0, )",
+ "resolved": "0.48.0",
+ "contentHash": "4Mc1UT7Azgtyb8FyNwK5FZmoZbKuT5PmY7ZwaKUytjD5kGFMNBACpOZTwYtkuY377YkYtZYBeDDTJUwTW86QXw==",
"dependencies": {
"System.Memory": "4.5.5"
}
@@ -126,9 +126,13 @@
},
"System.IO.Abstractions": {
"type": "Direct",
- "requested": "[17.2.3, )",
- "resolved": "17.2.3",
- "contentHash": "VcozGeE4SxIo0cnXrDHhbrh/Gb8KQnZ3BvMelvh+iw0PrIKtuuA46U2Xm4e4pgnaWFgT4RdZfTpWl/WPRdw0WQ=="
+ "requested": "[20.0.4, )",
+ "resolved": "20.0.4",
+ "contentHash": "Vv3DffYCM/DEQ7+9Dn7ydq852WSVtdeoLNlztIqaMAl4o6aALyAJQRTQ30d/3D7BVf5pALsGm22HYb4Y6h8xvw==",
+ "dependencies": {
+ "TestableIO.System.IO.Abstractions": "20.0.4",
+ "TestableIO.System.IO.Abstractions.Wrappers": "20.0.4"
+ }
},
"Thoth.Json.Net": {
"type": "Direct",
@@ -447,11 +451,6 @@
"resolved": "4.3.2",
"contentHash": "leXiwfiIkW7Gmn7cgnNcdtNAU70SjmKW3jxGj1iKHOvdn0zRWsgv/l2OJUO5zdGdiv2VRFnAsxxhDgMzofPdWg=="
},
- "SemanticVersioning": {
- "type": "Transitive",
- "resolved": "2.0.2",
- "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA=="
- },
"System.AppContext": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -534,14 +533,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Diagnostics.DiagnosticSource": {
- "type": "Transitive",
- "resolved": "7.0.0",
- "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==",
- "dependencies": {
- "System.Runtime.CompilerServices.Unsafe": "6.0.0"
- }
- },
"System.Diagnostics.Tools": {
"type": "Transitive",
"resolved": "4.3.0",
@@ -710,11 +701,6 @@
"System.Threading": "4.3.0"
}
},
- "System.Memory": {
- "type": "Transitive",
- "resolved": "4.5.5",
- "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
- },
"System.Net.Http": {
"type": "Transitive",
"resolved": "4.3.4",
@@ -869,15 +855,6 @@
"System.Runtime": "4.3.0"
}
},
- "System.Runtime": {
- "type": "Transitive",
- "resolved": "4.3.1",
- "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==",
- "dependencies": {
- "Microsoft.NETCore.Platforms": "1.1.1",
- "Microsoft.NETCore.Targets": "1.1.3"
- }
- },
"System.Runtime.CompilerServices.Unsafe": {
"type": "Transitive",
"resolved": "6.0.0",
@@ -1213,6 +1190,19 @@
"System.Xml.ReaderWriter": "4.3.0"
}
},
+ "TestableIO.System.IO.Abstractions": {
+ "type": "Transitive",
+ "resolved": "20.0.4",
+ "contentHash": "zvuE3an8qmEjlz72ZKyW/gBZprR0TMTDxuw77i1OXi5wEagXRhHwP4lOaLvHIXNlwyCAmdmei6iLHsfsZcuUAA=="
+ },
+ "TestableIO.System.IO.Abstractions.Wrappers": {
+ "type": "Transitive",
+ "resolved": "20.0.4",
+ "contentHash": "LbVaZauZfCkcGmHyPhQ2yiKv5GQqTvMViPYd3NjU1tGxp0N2p7Oc6Q/2trN6ZNIZCr42ujJdYUB63hE4mtsHRQ==",
+ "dependencies": {
+ "TestableIO.System.IO.Abstractions": "20.0.4"
+ }
+ },
"fantomas.client": {
"type": "Project",
"dependencies": {
@@ -1236,6 +1226,37 @@
"System.Memory": "[4.5.5, )",
"System.Runtime": "[4.3.1, )"
}
+ },
+ "SemanticVersioning": {
+ "type": "CentralTransitive",
+ "requested": "[2.0.2, )",
+ "resolved": "2.0.2",
+ "contentHash": "4EQgYdNZ92SyaO7YFk6olVnebF5V+jrHyMUjvPq89tLeMo8NSfgDF+6Zwq/lgh9j/0yfQp9Lkm0ZA0rUATCZFA=="
+ },
+ "System.Diagnostics.DiagnosticSource": {
+ "type": "CentralTransitive",
+ "requested": "[7.0.0, )",
+ "resolved": "7.0.0",
+ "contentHash": "9W0ewWDuAyDqS2PigdTxk6jDKonfgscY/hP8hm7VpxYhNHZHKvZTdRckberlFk3VnCmr3xBUyMBut12Q+T2aOw==",
+ "dependencies": {
+ "System.Runtime.CompilerServices.Unsafe": "6.0.0"
+ }
+ },
+ "System.Memory": {
+ "type": "CentralTransitive",
+ "requested": "[4.5.5, )",
+ "resolved": "4.5.5",
+ "contentHash": "XIWiDvKPXaTveaB7HVganDlOCRoj03l+jrwNvcge/t8vhGYKvqV+dMv6G4SAX2NoNmN0wZfVPTAlFwZcZvVOUw=="
+ },
+ "System.Runtime": {
+ "type": "CentralTransitive",
+ "requested": "[4.3.1, )",
+ "resolved": "4.3.1",
+ "contentHash": "abhfv1dTK6NXOmu4bgHIONxHyEqFjW8HwXPmpY9gmll+ix9UNo4XDcmzJn6oLooftxNssVHdJC1pGT9jkSynQg==",
+ "dependencies": {
+ "Microsoft.NETCore.Platforms": "1.1.1",
+ "Microsoft.NETCore.Targets": "1.1.3"
+ }
}
}
}