From 4fe47833bb07becd48e580e1d43811658a6206d9 Mon Sep 17 00:00:00 2001
From: Tomi Parviainen <tomi.parviainen@gmail.com>
Date: Sun, 19 Nov 2023 15:22:36 +0200
Subject: [PATCH] Update TFM to net8.0 and bump NuGet packages (#172)

---
 .github/workflows/build.yml                   |  2 +-
 .github/workflows/docfx.yml                   |  2 +-
 .github/workflows/nuget.yml                   |  2 +-
 .github/workflows/tests.yml                   |  2 +-
 build/build.ps1                               |  6 ++--
 build/version.txt                             |  2 +-
 src/ClashOfClans.App/ClashOfClans.App.csproj  |  4 +--
 .../ClashOfClans.Blazor.csproj                |  2 +-
 .../ClashOfClans.Models.csproj                |  4 +--
 .../ClashOfClans.Tests.Integration.csproj     |  6 ++--
 .../ClashOfClans.Tests.Unit.csproj            |  2 +-
 src/ClashOfClans/ClashOfClans.csproj          |  8 ++---
 src/ClashOfClans/ClashOfClans.nuspec          | 32 ++++++++++++-------
 13 files changed, 41 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c3c8c513..faea325b 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -21,7 +21,7 @@ jobs:
         with:
           dotnet-version: |
             6.0.x
-            7.0.x
+            8.0.x
 
       - name: Build with dotnet
         run: dotnet build ./src/ClashOfClans.sln
diff --git a/.github/workflows/docfx.yml b/.github/workflows/docfx.yml
index 723c8b41..ee59a2f0 100644
--- a/.github/workflows/docfx.yml
+++ b/.github/workflows/docfx.yml
@@ -22,7 +22,7 @@ jobs:
           token: ${{ secrets.DOCFX_API_KEY }}
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "7.0.x"
+          dotnet-version: "8.0.x"
 
       - name: Build with dotnet
         run: dotnet build ./src/ClashOfClans/ClashOfClans.csproj
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
index 9619da4c..46b704c5 100644
--- a/.github/workflows/nuget.yml
+++ b/.github/workflows/nuget.yml
@@ -10,7 +10,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "7.0.x"
+          dotnet-version: "8.0.x"
 
       - name: Setup NuGet CLI
         run: choco install nuget.commandline
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index be535459..ec7aacbc 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -21,7 +21,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: "7.0.x"
+          dotnet-version: "8.0.x"
 
       - name: Unit Tests
         working-directory: src
diff --git a/build/build.ps1 b/build/build.ps1
index 4331efdf..d4a040b1 100644
--- a/build/build.ps1
+++ b/build/build.ps1
@@ -2,9 +2,9 @@
 
 $version = Get-PackageVersion
 $packageId = "ClashOfClans"
-$basePath = "..\src\ClashOfClans\"
-$project = $basePath + $packageId + ".csproj"
-$nuspec = $basePath + $packageId + ".nuspec"
+$basePath = Join-Path ".." "src" "ClashOfClans"
+$project = Join-Path $basePath "$packageId.csproj"
+$nuspec = Join-Path $basePath "$packageId.nuspec"
 $nupkg = "$packageId.$version.nupkg"
 $configuration = "Release"
 $commit = Get-CommitHash
diff --git a/build/version.txt b/build/version.txt
index c6520dff..b340b728 100644
--- a/build/version.txt
+++ b/build/version.txt
@@ -6,4 +6,4 @@
 #   Patch: Backwards compatible bug fixes only
 #   -Suffix (optional): a hyphen followed by a string denoting a pre-release version (rc1, rc2, etc.)
 
-8.8.1
+8.8.2-rc2
diff --git a/src/ClashOfClans.App/ClashOfClans.App.csproj b/src/ClashOfClans.App/ClashOfClans.App.csproj
index 80fb8927..3036944a 100644
--- a/src/ClashOfClans.App/ClashOfClans.App.csproj
+++ b/src/ClashOfClans.App/ClashOfClans.App.csproj
@@ -2,13 +2,13 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="ClashOfClans" Version="8.8.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ClashOfClans.Blazor/ClashOfClans.Blazor.csproj b/src/ClashOfClans.Blazor/ClashOfClans.Blazor.csproj
index 15b937ee..338276b8 100644
--- a/src/ClashOfClans.Blazor/ClashOfClans.Blazor.csproj
+++ b/src/ClashOfClans.Blazor/ClashOfClans.Blazor.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/src/ClashOfClans.Models/ClashOfClans.Models.csproj b/src/ClashOfClans.Models/ClashOfClans.Models.csproj
index 04d7de9b..4fbf741e 100644
--- a/src/ClashOfClans.Models/ClashOfClans.Models.csproj
+++ b/src/ClashOfClans.Models/ClashOfClans.Models.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>
diff --git a/src/ClashOfClans.Tests.Integration/ClashOfClans.Tests.Integration.csproj b/src/ClashOfClans.Tests.Integration/ClashOfClans.Tests.Integration.csproj
index 71e36a88..a5152fb3 100644
--- a/src/ClashOfClans.Tests.Integration/ClashOfClans.Tests.Integration.csproj
+++ b/src/ClashOfClans.Tests.Integration/ClashOfClans.Tests.Integration.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
     <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
diff --git a/src/ClashOfClans.Tests.Unit/ClashOfClans.Tests.Unit.csproj b/src/ClashOfClans.Tests.Unit/ClashOfClans.Tests.Unit.csproj
index 2a90c829..1d82e487 100644
--- a/src/ClashOfClans.Tests.Unit/ClashOfClans.Tests.Unit.csproj
+++ b/src/ClashOfClans.Tests.Unit/ClashOfClans.Tests.Unit.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/ClashOfClans/ClashOfClans.csproj b/src/ClashOfClans/ClashOfClans.csproj
index 9bb70c8b..4e4ab29c 100644
--- a/src/ClashOfClans/ClashOfClans.csproj
+++ b/src/ClashOfClans/ClashOfClans.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;netstandard2.1;net6.0;net7.0;net8.0</TargetFrameworks>
     <LangVersion>8.0</LangVersion>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NuspecFile>ClashOfClans.nuspec</NuspecFile>
@@ -22,9 +22,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/ClashOfClans/ClashOfClans.nuspec b/src/ClashOfClans/ClashOfClans.nuspec
index 2630c737..4a4eb64f 100644
--- a/src/ClashOfClans/ClashOfClans.nuspec
+++ b/src/ClashOfClans/ClashOfClans.nuspec
@@ -16,24 +16,29 @@
     <repository type="git" url="https://github.com/tparviainen/clashofclans" branch="$branch$" commit="$commit$"/>
     <dependencies>
       <group targetFramework="netstandard2.0">
-        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" />
-        <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" />
-        <dependency id="Newtonsoft.Json" version="13.0.1" />
+        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.0" />
+        <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="8.0.0" />
+        <dependency id="Newtonsoft.Json" version="13.0.3" />
       </group>
       <group targetFramework="netstandard2.1">
-        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" />
-        <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" />
-        <dependency id="Newtonsoft.Json" version="13.0.1" />
+        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.0" />
+        <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="8.0.0" />
+        <dependency id="Newtonsoft.Json" version="13.0.3" />
       </group>
       <group targetFramework="net6.0">
-        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" />
-        <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" />
-        <dependency id="Newtonsoft.Json" version="13.0.1" />
+        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.0" />
+        <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="8.0.0" />
+        <dependency id="Newtonsoft.Json" version="13.0.3" />
       </group>
       <group targetFramework="net7.0">
-        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="7.0.0" />
-        <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="7.0.0" />
-        <dependency id="Newtonsoft.Json" version="13.0.1" />
+        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.0" />
+        <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="8.0.0" />
+        <dependency id="Newtonsoft.Json" version="13.0.3" />
+      </group>
+      <group targetFramework="net8.0">
+        <dependency id="Microsoft.Extensions.DependencyInjection.Abstractions" version="8.0.0" />
+        <dependency id="Microsoft.Extensions.Options.ConfigurationExtensions" version="8.0.0" />
+        <dependency id="Newtonsoft.Json" version="13.0.3" />
       </group>
     </dependencies>
   </metadata>
@@ -52,5 +57,8 @@
     <file src="bin\Release\net7.0\*.dll" target="lib\net7.0" />
     <file src="bin\Release\net7.0\*.pdb" target="lib\net7.0" />
     <file src="bin\Release\net7.0\ClashOfClans.xml" target="lib\net7.0" />
+    <file src="bin\Release\net8.0\*.dll" target="lib\net8.0" />
+    <file src="bin\Release\net8.0\*.pdb" target="lib\net8.0" />
+    <file src="bin\Release\net8.0\ClashOfClans.xml" target="lib\net8.0" />
   </files>
 </package>