Merge pull request #288 from CodebreakerApp/287-clientlib-dotnet9

287 clientlib dotnet9
CodebreakerApp · Nov 16, 2024 · 100f729 · 100f729
2 parents c63b8f7 + 9dc557b
commit 100f729
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 14 deletions.
diff --git a/src/clients/Codebreaker.GameAPIs.Client.Tests/Codebreaker.GameAPIs.Client.Tests.csproj b/src/clients/Codebreaker.GameAPIs.Client.Tests/Codebreaker.GameAPIs.Client.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,11 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="Moq" Version="4.20.70" />
-    <PackageReference Include="xunit" Version="2.8.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.1">
+    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="xunit" Version="2.9.2" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/src/clients/Codebreaker.GameAPIs.Client/Codebreaker.GameAPIs.Client.csproj b/src/clients/Codebreaker.GameAPIs.Client/Codebreaker.GameAPIs.Client.csproj
@@ -2,10 +2,10 @@
 
   <PropertyGroup>
     <PackageId>CNinnovation.Codebreaker.GamesClient</PackageId>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>latest</LangVersion>
     <PackageTags>
       Codebreaker;CNinnovation;GamesClient;
     </PackageTags>
@@ -15,19 +15,21 @@
     </Description>
     <PackageReadmeFile>readme.md</PackageReadmeFile>
     <PackageIcon>codebreaker.jpeg</PackageIcon>
+	<Version>3.8.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <None Include="docs/readme.md" Pack="true" PackagePath="\" />
     <None Include="Images/codebreaker.jpeg" Pack="true" PackagePath="\" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)'=='net7.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
-  </ItemGroup>
-
+  <!-- Not forcing a .NET 8 client who reference this package to use a newer Microsoft.Extensions.Logging.Abstractions library -->
   <ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
   </ItemGroup>
 
+	<ItemGroup Condition="'$(TargetFramework)'=='net9.0'">
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
+	</ItemGroup>
+
 </Project>
diff --git a/...lients/Codebreaker.GameAPIs.Client/Log.cs → ...ebreaker.GameAPIs.Client/LogExtensions.cs b/...lients/Codebreaker.GameAPIs.Client/Log.cs → ...ebreaker.GameAPIs.Client/LogExtensions.cs
@@ -1,6 +1,6 @@
 namespace Codebreaker.GameAPIs.Client;
 
-internal static partial class Log
+internal static partial class LogExtensions
 {
     [LoggerMessage(2000, LogLevel.Information, "GetGameAsync game {GameId} not found: {ErrorMessage}", EventName = "GetGame")]
     public static partial void GetGameNotFound(this ILogger logger, Guid gameId, string errorMessage);