From 4b0ee66265aeb3841d7dc0ba588e0ee42dd4faca Mon Sep 17 00:00:00 2001
From: "Andres G. Aragoneses" <knocte@gmail.com>
Date: Fri, 2 Feb 2024 13:43:55 +0800
Subject: [PATCH 1/3] Upgrade to .NET7

Because Nuget's Centralized Package Management requires
.NET 6.0.300 but Ubuntu's dotnet6 is too old for that
so we simply switch to 7.x.
---
 .github/workflows/CI.yml         | 2 +-
 src/FX.Console/FX.Console.fsproj | 2 +-
 src/FX.Core/FX.Core.fsproj       | 2 +-
 src/FX.Tests/FX.Tests.csproj     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 94c88c1..0d86928 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -29,7 +29,7 @@ jobs:
           # The remote certificate is invalid because of errors in the certificate chain: UntrustedRoot
           apt install --yes --no-install-recommends ca-certificates
 
-          apt install --yes --no-install-recommends dotnet6
+          apt install --yes --no-install-recommends dotnet7
 
       - name: Compile the main solution
         run: dotnet build
diff --git a/src/FX.Console/FX.Console.fsproj b/src/FX.Console/FX.Console.fsproj
index 87e5803..f77dce4 100644
--- a/src/FX.Console/FX.Console.fsproj
+++ b/src/FX.Console/FX.Console.fsproj
@@ -11,6 +11,6 @@
 
   <ItemGroup>
     <ProjectReference Include="..\FX.Core\FX.Core.fsproj" />
-    <PackageReference Include="FSharp.Core" Version="6.0.1" />
+    <PackageReference Include="FSharp.Core" Version="7.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/FX.Core/FX.Core.fsproj b/src/FX.Core/FX.Core.fsproj
index a079df5..a09847f 100644
--- a/src/FX.Core/FX.Core.fsproj
+++ b/src/FX.Core/FX.Core.fsproj
@@ -12,7 +12,7 @@
     <Compile Include="Exchange.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="6.0.1" />
+    <PackageReference Include="FSharp.Core" Version="7.0.0" />
     <PackageReference Include="StackExchange.Redis" Version="2.0.513" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>
diff --git a/src/FX.Tests/FX.Tests.csproj b/src/FX.Tests/FX.Tests.csproj
index e5d0208..a28e77a 100644
--- a/src/FX.Tests/FX.Tests.csproj
+++ b/src/FX.Tests/FX.Tests.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net7.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.9.0" />
-    <PackageReference Include="FSharp.Core" Version="6.0.1" />
+    <PackageReference Include="FSharp.Core" Version="7.0.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
     <PackageReference Include="StackExchange.Redis" Version="2.0.513" />

From ee69be3ed8c25f17809b0954073ed1833c33786e Mon Sep 17 00:00:00 2001
From: "Andres G. Aragoneses" <knocte@gmail.com>
Date: Fri, 2 Feb 2024 15:49:00 +0800
Subject: [PATCH 2/3] WebSocketApp: stop using floating numbers

Otherwise when starting to use nuget Centralized Package
Management we would get this error:

```
error NU1011: Centrally defined floating package versions are not allowed.
```
---
 src/WebSocketApp/WebSocketApp.fsproj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/WebSocketApp/WebSocketApp.fsproj b/src/WebSocketApp/WebSocketApp.fsproj
index 99d906c..26a3b69 100644
--- a/src/WebSocketApp/WebSocketApp.fsproj
+++ b/src/WebSocketApp/WebSocketApp.fsproj
@@ -23,9 +23,9 @@
     <Compile Include="Middleware\WebSocketMiddleware.fs" />
     <Compile Include="Program.fs" />
     <None Include="web.config" CopyToOutputDirectory="PreserveNewest" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.*" />
+    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.34" />
     <PackageReference Include="Giraffe" Version="3.1.0" />
-    <PackageReference Include="Giraffe.Razor" Version="1.3.*" />
+    <PackageReference Include="Giraffe.Razor" Version="1.3.0" />
     <Watch Include="**\*.cshtml" Exclude="bin\**\*" />
     <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
     <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />

From 1308d38a7b95f44f2d3e19c8523ec40c9b21e234 Mon Sep 17 00:00:00 2001
From: "Andres G. Aragoneses" <knocte@gmail.com>
Date: Fri, 2 Feb 2024 15:58:54 +0800
Subject: [PATCH 3/3] Nuget Centralized Package Management

In order to have version numbers for all projects
in a single file (and this way avoiding the problem
of depending on more than one version for the same
package).
---
 Directory.Build.targets              | 16 ++++++++++++++++
 Directory.Packages.props             | 17 +++++++++++++++++
 src/FX.Console/FX.Console.fsproj     |  1 -
 src/FX.Core/FX.Core.fsproj           |  5 ++---
 src/FX.Tests/FX.Tests.csproj         | 11 +++++------
 src/WebSocketApp/WebSocketApp.fsproj | 10 +++++-----
 6 files changed, 45 insertions(+), 15 deletions(-)
 create mode 100644 Directory.Build.targets
 create mode 100644 Directory.Packages.props

diff --git a/Directory.Build.targets b/Directory.Build.targets
new file mode 100644
index 0000000..96627be
--- /dev/null
+++ b/Directory.Build.targets
@@ -0,0 +1,16 @@
+<!-- Workaround for Central Package Management taken from
+     https://github.com/NuGet/Home/issues/11949 and
+     https://github.com/microsoft/MSBuildSdks/blob/22cee25ad037827b54b75b6ee1c59a5bc75a744f/src/CentralPackageVersions/Sdk/Sdk.targets#L70-L76
+
+     TODO: when upgrading to .NET8.0, we can simply use <PackageReference Include="FSharp.Core" VersionOverride="7.0.0" /> for example, and it
+     just works (example of a project that works today this way: fantomas)
+-->
+<Project>
+    <ItemGroup Condition=" '$(EnableCentralPackageVersions)' != 'false' ">
+        <PackageReference
+            Update="FSharp.Core"
+            Condition="'$(MSBuildProjectExtension)' == '.fsproj' And '$(DisableImplicitFSharpCoreReference)' != 'true' And '$(UpdateImplicitFSharpCoreReference)' != 'false'"
+            IsImplicitlyDefined="true"
+        />
+    </ItemGroup>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
new file mode 100644
index 0000000..1efa6fd
--- /dev/null
+++ b/Directory.Packages.props
@@ -0,0 +1,17 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="StackExchange.Redis" Version="2.0.513" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NUnit" Version="3.9.0" />
+    <PackageVersion Include="NUnit3TestAdapter" Version="3.9.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.App" Version="2.1.34" />
+    <PackageVersion Include="Giraffe" Version="3.1.0" />
+    <PackageVersion Include="Giraffe.Razor" Version="1.3.0" />
+    <PackageVersion Include="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
+    <PackageVersion Include="TaskBuilder.fs" Version="2.1.0" />
+  </ItemGroup>
+</Project>
diff --git a/src/FX.Console/FX.Console.fsproj b/src/FX.Console/FX.Console.fsproj
index f77dce4..0c48ae9 100644
--- a/src/FX.Console/FX.Console.fsproj
+++ b/src/FX.Console/FX.Console.fsproj
@@ -11,6 +11,5 @@
 
   <ItemGroup>
     <ProjectReference Include="..\FX.Core\FX.Core.fsproj" />
-    <PackageReference Include="FSharp.Core" Version="7.0.0" />
   </ItemGroup>
 </Project>
diff --git a/src/FX.Core/FX.Core.fsproj b/src/FX.Core/FX.Core.fsproj
index a09847f..b1da1f4 100644
--- a/src/FX.Core/FX.Core.fsproj
+++ b/src/FX.Core/FX.Core.fsproj
@@ -12,8 +12,7 @@
     <Compile Include="Exchange.fs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="FSharp.Core" Version="7.0.0" />
-    <PackageReference Include="StackExchange.Redis" Version="2.0.513" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="StackExchange.Redis" />
+    <PackageReference Include="Newtonsoft.Json" />
   </ItemGroup>
 </Project>
diff --git a/src/FX.Tests/FX.Tests.csproj b/src/FX.Tests/FX.Tests.csproj
index a28e77a..a2c40ae 100644
--- a/src/FX.Tests/FX.Tests.csproj
+++ b/src/FX.Tests/FX.Tests.csproj
@@ -5,12 +5,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="NUnit" Version="3.9.0" />
-    <PackageReference Include="FSharp.Core" Version="7.0.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />
-    <PackageReference Include="StackExchange.Redis" Version="2.0.513" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="NUnit" />
+    <PackageReference Include="NUnit3TestAdapter" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" />
+    <PackageReference Include="StackExchange.Redis" />
+    <PackageReference Include="Newtonsoft.Json" />
   </ItemGroup>
   <ItemGroup>
     <Compile Remove="Class1.cs" />
diff --git a/src/WebSocketApp/WebSocketApp.fsproj b/src/WebSocketApp/WebSocketApp.fsproj
index 26a3b69..c4b6535 100644
--- a/src/WebSocketApp/WebSocketApp.fsproj
+++ b/src/WebSocketApp/WebSocketApp.fsproj
@@ -23,12 +23,12 @@
     <Compile Include="Middleware\WebSocketMiddleware.fs" />
     <Compile Include="Program.fs" />
     <None Include="web.config" CopyToOutputDirectory="PreserveNewest" />
-    <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.34" />
-    <PackageReference Include="Giraffe" Version="3.1.0" />
-    <PackageReference Include="Giraffe.Razor" Version="1.3.0" />
+    <PackageReference Include="Microsoft.AspNetCore.App" />
+    <PackageReference Include="Giraffe" />
+    <PackageReference Include="Giraffe.Razor" />
     <Watch Include="**\*.cshtml" Exclude="bin\**\*" />
-    <PackageReference Include="Microsoft.AspNetCore.WebSockets" Version="2.1.1" />
-    <PackageReference Include="TaskBuilder.fs" Version="2.1.0" />
+    <PackageReference Include="Microsoft.AspNetCore.WebSockets" />
+    <PackageReference Include="TaskBuilder.fs" />
     <ProjectReference Include="..\FX.Core\FX.Core.fsproj" />
   </ItemGroup>
 </Project>