Update

.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

CHANGELOG.md

@@ -6,17 +6,30 @@ 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)
 
 ### Changed
 - 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

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)

run.fs

@@ -30,51 +30,58 @@ let inline getSrcProjects () =
 
 [<RequireQualifiedAccess>]
 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
 [<EntryPoint>]
 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 <version>" ]
         | _ -> Job.error [ "Usage: dotnet run <command>"; "Look up available commands in run.fs" ]

run.fsproj

@@ -8,6 +8,6 @@
     <Compile Include="run.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="NicoVIII.RunHelpers" Version="0.5.0-alpha.6" />
+    <PackageReference Include="NicoVIII.RunHelpers" Version="0.5.0" />
   </ItemGroup>
 </Project>

src/Basealize/Basealize.fsproj

@@ -1,17 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
     <Product>NicoVIII.Basealize</Product>
     <PackageId>NicoVIII.Basealize</PackageId>
     <Title>Basealize</Title>
     <Description>A package to help creating libraries for converting numbers to different bases and the otherway around.</Description>
     <Tags>Numberbases</Tags>
   </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="Types.fs" />
     <Compile Include="Display.fs" />
     <Compile Include="Parse.fs" />
     <Compile Include="Api.fs" />
   </ItemGroup>
+
+  <Import Project="..\..\.paket\Paket.Restore.targets" />
+
 </Project>

src/Basealize/paket.references

@@ -0,0 +1 @@
+FSharp.Core

src/Dozenalize/Dozenalize.fsproj

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup>
     <Product>NicoVIII.Dozenalize</Product>
     <PackageId>NicoVIII.Dozenalize</PackageId>
     <Title>Dozenalize</Title>
@@ -16,4 +18,5 @@
   <ItemGroup>
     <ProjectReference Include="..\Basealize\Basealize.fsproj" />
   </ItemGroup>
-</Project>
+  <Import Project="..\..\.paket\Paket.Restore.targets" />
+</Project>

src/Dozenalize/paket.references

@@ -0,0 +1 @@
+FSharp.Core

src/Niftimalize/Niftimalize.fsproj

@@ -1,18 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
     <Product>NicoVIII.Niftimalize</Product>
     <PackageId>NicoVIII.Niftimalize</PackageId>
     <Title>Niftimalize</Title>
     <Description>A package to help converting numbers to niftimal and the other way around.</Description>
     <Tags>Numberbases;Niftimal</Tags>
   </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="Convert.fs" />
     <Compile Include="Api.fs" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Basealize\Basealize.fsproj" />
   </ItemGroup>
+
+  <Import Project="..\..\.paket\Paket.Restore.targets" />
+
 </Project>

src/Niftimalize/paket.references

@@ -0,0 +1 @@
+FSharp.Core

src/Seximalize/Seximalize.fsproj

@@ -1,18 +1,26 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
     <Product>NicoVIII.Seximalize</Product>
     <PackageId>NicoVIII.Seximalize</PackageId>
     <Title>Seximalize</Title>
     <Description>A package to help converting numbers to seximal and the other way around.</Description>
     <Tags>Numberbases;Seximal</Tags>
   </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="Convert.fs" />
     <Compile Include="Api.fs" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Basealize\Basealize.fsproj" />
   </ItemGroup>
+
+  <Import Project="..\..\.paket\Paket.Restore.targets" />
+
 </Project>

src/Seximalize/paket.references

@@ -0,0 +1 @@
+FSharp.Core

tests/Dozenalize.UnitTests/paket.references

@@ -1,4 +1,3 @@
-FSharp.Core
 Expecto
 FsCheck
 Expecto.FsCheck

tests/Niftimalize.UnitTests/Niftimalize.UnitTests.fsproj

@@ -6,9 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Niftimalize\Niftimalize.fsproj">
-      <Name>Niftimalize.fsproj</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\..\src\Niftimalize\Niftimalize.fsproj" />
   </ItemGroup>
 
   <ItemGroup>

tests/Niftimalize.UnitTests/paket.references

@@ -1,4 +1,3 @@
-FSharp.Core
 Expecto
 FsCheck
 Expecto.FsCheck

tests/Seximalize.UnitTests/paket.references

@@ -1,4 +1,3 @@
-FSharp.Core
 Expecto
 FsCheck
 Expecto.FsCheck