From 6abfcf6aaf338fd38bbb99bdfec94625bb5e8843 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Chassaing?= Date: Tue, 19 Jul 2022 16:13:49 +0200 Subject: [PATCH] Fix: use same constraint >= 6.0.1 for Fantomas.Core and Fantomas.FCS (#2375) * Fix: use same constraint >= 6.0.1 for Fantomas.Core and Fantomas.FCS * Update changelog for 5.0.0-beta-002. Co-authored-by: nojaf --- CHANGELOG.md | 3 ++- paket.dependencies | 4 ++-- paket.lock | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2ab85a920f..3edbaab67a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,10 @@ # Changelog -## [Unreleased] +## [5.0.0-beta-002] - 2022-07-19 ### Fixed * Idempotency problem when using object expression and having a space between get / set lines. [#2372](https://github.com/fsprojects/fantomas/issues/2372) +* FSharp.Core version conflict between Fantomas.Core and Fantomas.FCS. [#2374](https://github.com/fsprojects/fantomas/issues/2374) ## [5.0.0-beta-001] - 2022-07-15 diff --git a/paket.dependencies b/paket.dependencies index 691b753690..18da473dac 100644 --- a/paket.dependencies +++ b/paket.dependencies @@ -3,7 +3,7 @@ source https://api.nuget.org/v3/index.json framework: netstandard2.0, net6.0, netcoreapp3.1 storage: none -nuget FSharp.Core content: none +nuget FSharp.Core >= 6.0.1 content: none nuget FsUnit nuget FsCheck nuget Microsoft.NET.Test.Sdk @@ -153,7 +153,7 @@ group compiler source https://api.nuget.org/v3/index.json framework: netstandard2.0 - nuget FSharp.Core 6.0.1 content: none + nuget FSharp.Core >= 6.0.1 content: none nuget System.Memory nuget System.Runtime nuget FsLexYacc 10.2.0 diff --git a/paket.lock b/paket.lock index 55743c8437..22be9a765f 100644 --- a/paket.lock +++ b/paket.lock @@ -27,7 +27,7 @@ NUGET Microsoft.SourceLink.GitLab (>= 1.1.1) FsCheck (2.16.4) FSharp.Core (>= 4.2.3) - FSharp.Core (6.0.4) - content: none + FSharp.Core (6.0.1) - content: none FsUnit (4.2) FSharp.Core (>= 5.0.2) NETStandard.Library (>= 2.0.3)