Add .Net 8 target (#112)

* Add .net8 SDK * Refactor how DateTimeOffsetConverter is updated * Add .Net8 target * Fix DaktelaJsonSerializerContext for .NET8
aviationexam · Nov 15, 2023 · a6b7de3 · a6b7de3
1 parent 6831452
commit a6b7de3
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -14,10 +14,12 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
     steps:
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: |
+            7.0.x
+            8.0.x
       - uses: actions/checkout@v4
       - name: Restore
         run: dotnet restore --nologo src
@@ -36,10 +38,10 @@ jobs:
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
     steps:
       - uses: actions/checkout@v4
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net 8.0.x
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: Restore
         run: dotnet restore --nologo src
       - name: .Net Format

diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -11,10 +11,12 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
     steps:
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: |
+            7.0.x
+            8.0.x
       - uses: actions/checkout@v4
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow

diff --git a/.github/workflows/pr-build.yml b/.github/workflows/pr-build.yml
@@ -14,10 +14,12 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
     steps:
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: |
+            7.0.x
+            8.0.x
       - uses: actions/checkout@v4
       - name: Restore
         run: dotnet restore --nologo src
@@ -30,10 +32,10 @@ jobs:
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
     steps:
       - uses: actions/checkout@v4
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net 8.0.x
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: Restore
         run: dotnet restore --nologo src
       - name: .Net Format

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -10,10 +10,12 @@ jobs:
     env:
       DOTNET_CLI_TELEMETRY_OPTOUT: 'true'
     steps:
-      - name: Setup .Net 7.0.x
+      - name: Setup .Net
         uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: |
+            7.0.x
+            8.0.x
       - uses: actions/checkout@v4
       - name: Fetch all history for all tags and branches
         run: git fetch --prune --unshallow
@@ -43,4 +45,3 @@ jobs:
         run: dotnet nuget push 'nuget-packages/*.nupkg' --api-key ${{ secrets.GITHUB_TOKEN  }} --source github
       - name: Push package to Nuget
         run: dotnet nuget push 'nuget-packages/*.nupkg' --api-key ${{ secrets.NUGET_API_KEY }} --source https://api.nuget.org/v3/index.json
-
diff --git a/src/Daktela.HttpClient/Api/DaktelaJsonSerializerContext.cs b/src/Daktela.HttpClient/Api/DaktelaJsonSerializerContext.cs
@@ -1,6 +1,7 @@
 using Daktela.HttpClient.Implementations.JsonConverters;
 using System;
 using System.Collections.Generic;
+using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Daktela.HttpClient.Api;
@@ -61,26 +62,29 @@ public static TimeSpan SerializationDateTimeOffset
         set
         {
             _serializationDateTimeOffset = value;
-            s_defaultContext = null;
-            SetConverters();
+            DateTimeOffsetConverter.SetDateTimeOffset(_serializationDateTimeOffset);
         }
     }
 
+    private static readonly DateTimeOffsetConverter DateTimeOffsetConverter = new(SerializationDateTimeOffset);
+
     static DaktelaJsonSerializerContext()
     {
-        SetConverters();
+        SetConverters(s_defaultOptions.Converters);
+#if NET8_0_OR_GREATER
+        Default = new DaktelaJsonSerializerContext(new JsonSerializerOptions(s_defaultOptions));
+#endif
     }
 
-    static void SetConverters()
+    public static void SetConverters(ICollection<JsonConverter> jsonConverters)
     {
-        s_defaultOptions.Converters.Clear();
-        s_defaultOptions.Converters.Add(new DateTimeOffsetConverter(SerializationDateTimeOffset));
-        s_defaultOptions.Converters.Add(new TimeSpanConverter());
-        s_defaultOptions.Converters.Add(new ReadActivityConverter());
-        s_defaultOptions.Converters.Add(new CustomFieldsConverter());
-        s_defaultOptions.Converters.Add(new EnumsConverterFactory());
-        s_defaultOptions.Converters.Add(new EmailActivityOptionsHeadersAddressConverter());
-        s_defaultOptions.Converters.Add(new ErrorResponseConverter());
-        s_defaultOptions.Converters.Add(new ErrorFormConverter());
+        jsonConverters.Add(DateTimeOffsetConverter);
+        jsonConverters.Add(new TimeSpanConverter());
+        jsonConverters.Add(new ReadActivityConverter());
+        jsonConverters.Add(new CustomFieldsConverter());
+        jsonConverters.Add(new EnumsConverterFactory());
+        jsonConverters.Add(new EmailActivityOptionsHeadersAddressConverter());
+        jsonConverters.Add(new ErrorResponseConverter());
+        jsonConverters.Add(new ErrorFormConverter());
     }
 }
diff --git a/src/Daktela.HttpClient/Daktela.HttpClient.csproj b/src/Daktela.HttpClient/Daktela.HttpClient.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
     <PackageLicense>MIT</PackageLicense>
     <ProjectName>HttpClient</ProjectName>
@@ -18,15 +18,25 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <None Include="..\..\README.md" Pack="true" PackagePath="\"/>
+    <None Include="..\..\README.md" Pack="true" PackagePath="\" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net7.0' ">
     <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="7.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
     <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="7.0.0" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All"/>
+  </ItemGroup>
+
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Http" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Options.DataAnnotations" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Daktela.HttpClient/Implementations/JsonConverters/DateTimeOffsetConverter.cs b/src/Daktela.HttpClient/Implementations/JsonConverters/DateTimeOffsetConverter.cs
@@ -10,13 +10,18 @@ namespace Daktela.HttpClient.Implementations.JsonConverters;
 
 public class DateTimeOffsetConverter : JsonConverter<DateTimeOffset>, IDateTimeOffsetConverter
 {
-    private readonly TimeSpan _dateTimeOffset;
+    private TimeSpan _dateTimeOffset;
 
     public DateTimeOffsetConverter(TimeSpan dateTimeOffset)
     {
         _dateTimeOffset = dateTimeOffset;
     }
 
+    internal void SetDateTimeOffset(TimeSpan dateTimeOffset)
+    {
+        _dateTimeOffset = dateTimeOffset;
+    }
+
     public override DateTimeOffset Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
     {
         Debug.Assert(typeToConvert == typeof(DateTimeOffset));

diff --git a/tests/Daktela.HttpClient.Tests/Daktela.HttpClient.Tests.csproj b/tests/Daktela.HttpClient.Tests/Daktela.HttpClient.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <LangVersion>11.0</LangVersion>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <LangVersion>12.0</LangVersion>
     <Nullable>enable</Nullable>
 
     <IsPackable>false</IsPackable>
@@ -41,6 +41,17 @@
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="appsettings.json5" CopyToPublishDirectory="Always" CopyToOutputDirectory="Always" />
     <None Update="*.appsettings.json5" CopyToPublishDirectory="Always" CopyToOutputDirectory="Always" />