DotNet 8 + Kontent Delivery SDK v18

* Dotnet 8 * Update to Kontent Delivery SDK v18
alanta · Feb 28, 2024 · a446830 · a446830
1 parent 383e298
commit a446830
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 28 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -18,12 +18,11 @@ jobs:
     - name: Use GitVersion
       id: gitversion # step id used as reference for output values
       uses: gittools/actions/gitversion/execute@v0.9.11
-    - name: Setup .NET Core
+    - name: Setup dotnet
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: | 
-          3.1.x
-          6.0.x
+        dotnet-version: |
+          8.x
     - name: Build with dotnet
       run: dotnet build --configuration Release -p:Version=${{ steps.gitversion.outputs.nuGetVersionV2 }}
     - name: Test with dotnet

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -11,12 +11,11 @@ jobs:
     steps:
     - name: Download artifact
       run: wget -nv ${{ github.event.release.assets[0].browser_download_url }}
-    - name: Setup .NET Core
+    - name: Setup dotnet
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: | 
-          3.1.x
-          6.0.x
+        dotnet-version: |
+          8.x
     - name: Publish package
       env:
         NUGET_API_KEY: ${{ secrets.NUGET_API_KEY }}

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,12 +21,11 @@ jobs:
     - name: Use GitVersion
       id: gitversion # step id used as reference for output values
       uses: gittools/actions/gitversion/execute@v0.9.11
-    - name: Setup .NET Core
+    - name: Setup dotnet
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: | 
-          3.1.x
-          6.0.x
+        dotnet-version: |
+          8.x
     - name: Build with dotnet
       run: dotnet build --configuration Release -p:Version=${{ steps.gitversion.outputs.nuGetVersionV2 }}
     - name: Test with dotnet

diff --git a/Kontent.Statiq.Tests/Kontent.Statiq.Tests.csproj b/Kontent.Statiq.Tests/Kontent.Statiq.Tests.csproj
@@ -1,25 +1,26 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FakeItEasy" Version="7.3.1" />
-    <PackageReference Include="FluentAssertions" Version="6.6.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.1.0" />
-    <PackageReference Include="RichardSzalay.MockHttp" Version="6.0.0" />
+    <PackageReference Include="FakeItEasy" Version="8.1.0" />
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="RichardSzalay.MockHttp" Version="7.0.0" />
     <PackageReference Include="Statiq.Core" Version="1.0.0-*" />
     <PackageReference Include="Statiq.Razor" Version="1.0.0-*" />
     <PackageReference Include="Statiq.Testing" Version="1.0.0-*" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.assert" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.1.2">
+    <PackageReference Include="coverlet.collector" Version="6.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/Kontent.Statiq.Tests/Tools/LoggerTestExtensions.cs b/Kontent.Statiq.Tests/Tools/LoggerTestExtensions.cs
@@ -18,8 +18,7 @@ public static void VerifyLogged(this ILogger logger, LogLevel level, string logM
 
         if (actualLevel != level)
         {
-            throw new AssertActualExpectedException($"[{level}] {logMessage}", $"[{actualLevel}] {actualMessage}",
-                $"Unexpected log level for log message");
+            throw new XunitException($"Unexpected log level for log message. Expected: [{level}] `{logMessage}`. Actual: [{actualLevel}] `{actualMessage}`");
         }
     }
 

diff --git a/Kontent.Statiq.Tests/Tools/TestContentItemSystemAttributes.cs b/Kontent.Statiq.Tests/Tools/TestContentItemSystemAttributes.cs
@@ -14,6 +14,7 @@ internal sealed class TestContentItemSystemAttributes : IContentItemSystemAttrib
         public string Codename { get; internal set; } = "";
         public string Type { get; internal set; } = "";
         public string Collection { get; } = "";
+        public string Workflow => "";
         public string WorkflowStep { get; internal set; } = "";
         public IList<string> SitemapLocation { get; internal set; } = Array.Empty<string>();
         public DateTime LastModified { get; internal set; }

diff --git a/Kontent.Statiq.Tests/Tools/XUnitLogger.cs b/Kontent.Statiq.Tests/Tools/XUnitLogger.cs
@@ -38,7 +38,7 @@ public XunitLogger(ITestOutputHelper testOutputHelper, string categoryName)
             _categoryName = categoryName;
         }
 
-        public IDisposable BeginScope<TState>(TState state)
+        public IDisposable? BeginScope<TState>(TState state) where TState : notnull
         {
             return NoopDisposable.Instance;
         }

diff --git a/Kontent.Statiq/Kontent.Statiq.csproj b/Kontent.Statiq/Kontent.Statiq.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <Authors>Marnix van Valen</Authors>
     <Company>Kontent.Statiq</Company>
     <Description>Kentico Kontent module for Statiq. Fetch content and assets from Kontent headless CMS.</Description>
@@ -29,8 +29,8 @@
     </AssemblyAttribute>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Kontent.Ai.Delivery" Version="17.0.0" />
-    <PackageReference Include="SonarAnalyzer.CSharp" Version="8.38.0.46746">
+    <PackageReference Include="Kontent.Ai.Delivery" Version="18.0.0" />
+    <PackageReference Include="SonarAnalyzer.CSharp" Version="9.20.0.85982">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 
 Module to retrieve content from [Kentico Kontent](https://kontent.ai) for building static websites with [Statiq](https://Statiq.dev).
 
-Works with .NET 6.
+Works with .NET 8.
 
 ## Getting started
 
@@ -63,7 +63,7 @@ public static class Program
                 services.AddSingleton<ITypeProvider, CustomTypeProvider>();
                 // Configure Delivery SDK
                 services.AddDeliveryClient(opts =>
-                    opts.WithProjectId("<your-project-id>")
+                    opts.WithEnvironmentId("<your-environment-id>")
                         .UseProductionApi()
                         .Build());
             })