From ef9a8c4c427eba60e68ea7ba8d047b289f3d72dc Mon Sep 17 00:00:00 2001 From: NicoVIII Date: Sat, 9 Mar 2024 09:43:52 +0000 Subject: [PATCH] Update --- .editorconfig | 4 +- CHANGELOG.md | 20 +++++- paket.lock | 14 ++-- run.fs | 71 ++++++++++--------- run.fsproj | 2 +- src/Basealize/Basealize.fsproj | 13 +++- src/Basealize/paket.references | 1 + src/Dozenalize/Dozenalize.fsproj | 7 +- src/Dozenalize/paket.references | 1 + src/Niftimalize/Niftimalize.fsproj | 12 +++- src/Niftimalize/paket.references | 1 + src/Seximalize/Seximalize.fsproj | 14 +++- src/Seximalize/paket.references | 1 + tests/Dozenalize.UnitTests/paket.references | 1 - .../Niftimalize.UnitTests.fsproj | 4 +- tests/Niftimalize.UnitTests/paket.references | 1 - tests/Seximalize.UnitTests/paket.references | 1 - 17 files changed, 107 insertions(+), 61 deletions(-) create mode 100644 src/Basealize/paket.references create mode 100644 src/Dozenalize/paket.references create mode 100644 src/Niftimalize/paket.references create mode 100644 src/Seximalize/paket.references diff --git a/.editorconfig b/.editorconfig index 8c2d0d0..6b3c609 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,9 +9,7 @@ insert_final_newline = true trim_trailing_whitespace = true [*.fs] -fsharp_multiline_block_brackets_on_same_column = true -fsharp_experimental_stroustrup_style = true -fsharp_keep_max_number_of_blank_lines = 1 +fsharp_multiline_bracket_style = stroustrup [*.{c,f}sproj] indent_size = 2 diff --git a/CHANGELOG.md b/CHANGELOG.md index bff9a4a..8a6307a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,10 +6,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## [2.0.0] - 2024-03-09 + +### Changed + +- Require .NET 6 + +### Fixed + +- FSharp.Core dependency is now correctly set to >= 6.0.0, should have been something lower before for standard + ## [1.0.0] - 2022-11-09 + Initial stable version based on 0.3.0 ## [0.3.0] - 2021-08-07 + ### Added - Add C# interop layer (.CSharp namespace in every package) @@ -17,6 +29,7 @@ Initial stable version based on 0.3.0 - Preconfigured configs for Dozenalize are functions now ## [0.2.0] - 2021-07-01 + ### Added - Niftimalize as implementation for base thirtysix - Parse.tryDigit functions to all implementations @@ -25,12 +38,15 @@ Initial stable version based on 0.3.0 - Rearrange internal code, moved a bit more into Basealize ## [0.1.0] - 2021-06-25 + ### Added - Initial implementation of a base conversion library - Dozenalize as implementation for base twelve - Seximalize as implementation for base six -[Unreleased]: https://github.com/NicoVIII/Basealize/compare/v0.3.0...HEAD +[Unreleased]: https://github.com/NicoVIII/Basealize/compare/v2.0.0...HEAD +[2.0.0]: https://github.com/NicoVIII/Basealize/compare/v1.0.0..v2.0.0 +[1.0.0]: https://github.com/NicoVIII/Basealize/compare/v0.3.0..v1.0.0 [0.3.0]: https://github.com/NicoVIII/Basealize/compare/v0.2.0..v0.3.0 [0.2.0]: https://github.com/NicoVIII/Basealize/compare/v0.1.0..v0.2.0 -[0.1.0]: https://github.com/NicoVIII/Basealize/releases/v0.1.0 +[0.1.0]: https://github.com/NicoVIII/Basealize/commits/v0.1.0 diff --git a/paket.lock b/paket.lock index 55bad9a..5a280f6 100644 --- a/paket.lock +++ b/paket.lock @@ -2,13 +2,13 @@ STORAGE: NONE RESTRICTION: == net6.0 NUGET remote: https://api.nuget.org/v3/index.json - Expecto (10.1) - FSharp.Core (>= 7.0.200) - Mono.Cecil (>= 0.11.4 < 1.0) - Expecto.FsCheck (10.1) - Expecto (>= 10.1) - FsCheck (>= 2.16.5 < 3.0) + Expecto (9.0.4) + FSharp.Core (>= 4.6) + Mono.Cecil (>= 0.11.3) + Expecto.FsCheck (9.0.4) + Expecto (>= 9.0.4) + FsCheck (>= 2.14.3) FsCheck (2.16.6) FSharp.Core (>= 4.2.3) - FSharp.Core (8.0.200) + FSharp.Core (6.0) - redirects: force Mono.Cecil (0.11.5) diff --git a/run.fs b/run.fs index dcfb70e..4d5e8e1 100755 --- a/run.fs +++ b/run.fs @@ -30,31 +30,35 @@ let inline getSrcProjects () = [] module Task = - let restore () = job { - DotNet.toolRestore () + let restore () = + job { + DotNet.toolRestore () - for project in getAllProjects () do - DotNet.restore project - } + for project in getAllProjects () do + DotNet.restore project + } - let build config = job { - for project in getAllProjects () do - DotNet.build project config - } + let build config = + job { + for project in getAllProjects () do + DotNet.build project config + } - let test () = parallelJob { - for project in getTestProjects () do - DotNet.run project - } + let test () = + parallelJob { + for project in getTestProjects () do + DotNet.run project + } - let pack version = job { - Shell.cleanDir Config.packPath + let pack version = + job { + Shell.cleanDir Config.packPath - parallelJob { - for project in getSrcProjects () do - DotNet.pack Config.packPath project version + parallelJob { + for project in getSrcProjects () do + DotNet.pack Config.packPath project version + } } - } // We determine, what we want to execute [] @@ -62,19 +66,22 @@ let main args : int = List.ofArray args |> function | [ "restore" ] -> Task.restore () - | [ "build" ] -> job { - Task.restore () - Task.build Debug - } - | [ "test" ] -> job { - Task.restore () - Task.test () - } - | [ "pack"; version ] -> job { - Task.restore () - Task.build Debug - Task.pack version - } + | [ "build" ] -> + job { + Task.restore () + Task.build Debug + } + | [ "test" ] -> + job { + Task.restore () + Task.test () + } + | [ "pack"; version ] -> + job { + Task.restore () + Task.build Debug + Task.pack version + } // Catch errors and help | [ "pack" ] -> Job.error [ "Usage: dotnet run pack " ] | _ -> Job.error [ "Usage: dotnet run "; "Look up available commands in run.fs" ] diff --git a/run.fsproj b/run.fsproj index 0b0d777..e9ae719 100644 --- a/run.fsproj +++ b/run.fsproj @@ -8,6 +8,6 @@ - + diff --git a/src/Basealize/Basealize.fsproj b/src/Basealize/Basealize.fsproj index 59b27fe..d40091a 100644 --- a/src/Basealize/Basealize.fsproj +++ b/src/Basealize/Basealize.fsproj @@ -1,17 +1,24 @@ - - + + + + net6.0 + + - netstandard2.0 NicoVIII.Basealize NicoVIII.Basealize Basealize A package to help creating libraries for converting numbers to different bases and the otherway around. Numberbases + + + + diff --git a/src/Basealize/paket.references b/src/Basealize/paket.references new file mode 100644 index 0000000..6f627f4 --- /dev/null +++ b/src/Basealize/paket.references @@ -0,0 +1 @@ +FSharp.Core diff --git a/src/Dozenalize/Dozenalize.fsproj b/src/Dozenalize/Dozenalize.fsproj index 57c87d6..d1a1ea7 100644 --- a/src/Dozenalize/Dozenalize.fsproj +++ b/src/Dozenalize/Dozenalize.fsproj @@ -1,7 +1,9 @@  - netstandard2.0 + net6.0 + + NicoVIII.Dozenalize NicoVIII.Dozenalize Dozenalize @@ -16,4 +18,5 @@ - + + \ No newline at end of file diff --git a/src/Dozenalize/paket.references b/src/Dozenalize/paket.references new file mode 100644 index 0000000..6f627f4 --- /dev/null +++ b/src/Dozenalize/paket.references @@ -0,0 +1 @@ +FSharp.Core diff --git a/src/Niftimalize/Niftimalize.fsproj b/src/Niftimalize/Niftimalize.fsproj index 271a691..4184bf5 100644 --- a/src/Niftimalize/Niftimalize.fsproj +++ b/src/Niftimalize/Niftimalize.fsproj @@ -1,18 +1,26 @@ - + + + net6.0 + + - netstandard2.0 NicoVIII.Niftimalize NicoVIII.Niftimalize Niftimalize A package to help converting numbers to niftimal and the other way around. Numberbases;Niftimal + + + + + diff --git a/src/Niftimalize/paket.references b/src/Niftimalize/paket.references new file mode 100644 index 0000000..6f627f4 --- /dev/null +++ b/src/Niftimalize/paket.references @@ -0,0 +1 @@ +FSharp.Core diff --git a/src/Seximalize/Seximalize.fsproj b/src/Seximalize/Seximalize.fsproj index f88972e..85a3f48 100644 --- a/src/Seximalize/Seximalize.fsproj +++ b/src/Seximalize/Seximalize.fsproj @@ -1,18 +1,26 @@ - - + + + + net6.0 + + - netstandard2.0 NicoVIII.Seximalize NicoVIII.Seximalize Seximalize A package to help converting numbers to seximal and the other way around. Numberbases;Seximal + + + + + diff --git a/src/Seximalize/paket.references b/src/Seximalize/paket.references new file mode 100644 index 0000000..6f627f4 --- /dev/null +++ b/src/Seximalize/paket.references @@ -0,0 +1 @@ +FSharp.Core diff --git a/tests/Dozenalize.UnitTests/paket.references b/tests/Dozenalize.UnitTests/paket.references index d40fec0..6931383 100644 --- a/tests/Dozenalize.UnitTests/paket.references +++ b/tests/Dozenalize.UnitTests/paket.references @@ -1,4 +1,3 @@ -FSharp.Core Expecto FsCheck Expecto.FsCheck diff --git a/tests/Niftimalize.UnitTests/Niftimalize.UnitTests.fsproj b/tests/Niftimalize.UnitTests/Niftimalize.UnitTests.fsproj index f78611a..3adad63 100644 --- a/tests/Niftimalize.UnitTests/Niftimalize.UnitTests.fsproj +++ b/tests/Niftimalize.UnitTests/Niftimalize.UnitTests.fsproj @@ -6,9 +6,7 @@ - - Niftimalize.fsproj - + diff --git a/tests/Niftimalize.UnitTests/paket.references b/tests/Niftimalize.UnitTests/paket.references index d40fec0..6931383 100644 --- a/tests/Niftimalize.UnitTests/paket.references +++ b/tests/Niftimalize.UnitTests/paket.references @@ -1,4 +1,3 @@ -FSharp.Core Expecto FsCheck Expecto.FsCheck diff --git a/tests/Seximalize.UnitTests/paket.references b/tests/Seximalize.UnitTests/paket.references index d40fec0..6931383 100644 --- a/tests/Seximalize.UnitTests/paket.references +++ b/tests/Seximalize.UnitTests/paket.references @@ -1,4 +1,3 @@ -FSharp.Core Expecto FsCheck Expecto.FsCheck