From 6392259fd3a9d8b4fb380b0430548d7c594ce334 Mon Sep 17 00:00:00 2001
From: yreynhout <yves.reynhout@bittacklr.be>
Date: Thu, 23 Nov 2023 13:57:42 +0100
Subject: [PATCH] feat: upgrade everything to .net 8.0 lts

---
 .config/dotnet-tools.json                        |  2 +-
 global.json                                      |  2 +-
 .../AxonIQ.AxonServer.Connector.csproj           |  8 ++++----
 .../AxonIQ.AxonServer.Embedded.csproj            |  2 +-
 src/Benchmarks/Benchmarks.csproj                 | 10 +++++-----
 src/Sample/Sample.csproj                         | 12 ++++++------
 .../AxonIQ.AxonClusterIntegrationTests.csproj    | 14 +++++++-------
 .../AxonIQ.AxonServer.Connector.Tests.csproj     | 16 ++++++++--------
 .../AxonServerConnectorOptionsTests.cs           |  4 ++--
 .../ServiceCollectionExtensionsTests.cs          |  2 +-
 .../AxonIQ.AxonServerIntegrationTests.csproj     | 10 +++++-----
 11 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 7948667..8c3c579 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-outdated-tool": {
-      "version": "4.1.0",
+      "version": "4.6.0",
       "commands": [
         "dotnet-outdated"
       ]
diff --git a/global.json b/global.json
index 9fbac5c..8a1056e 100644
--- a/global.json
+++ b/global.json
@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "6.0.417"
+    "version": "8.0.100"
   }
 }
\ No newline at end of file
diff --git a/src/AxonIQ.AxonServer.Connector/AxonIQ.AxonServer.Connector.csproj b/src/AxonIQ.AxonServer.Connector/AxonIQ.AxonServer.Connector.csproj
index da2b802..67877d9 100644
--- a/src/AxonIQ.AxonServer.Connector/AxonIQ.AxonServer.Connector.csproj
+++ b/src/AxonIQ.AxonServer.Connector/AxonIQ.AxonServer.Connector.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>AxonIQ.AxonServer.Connector</RootNamespace>
@@ -27,10 +27,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
         <PackageReference Include="MinVer" Version="4.3.0" PrivateAssets="all" />
-        <PackageReference Include="Google.Protobuf" Version="3.24.4" />
-        <PackageReference Include="Grpc.Net.Client" Version="2.58.0" />
+        <PackageReference Include="Google.Protobuf" Version="3.25.1" />
+        <PackageReference Include="Grpc.Net.Client" Version="2.59.0" />
         <PackageReference Include="Grpc.Tools" Version="2.59.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
diff --git a/src/AxonIQ.AxonServer.Embedded/AxonIQ.AxonServer.Embedded.csproj b/src/AxonIQ.AxonServer.Embedded/AxonIQ.AxonServer.Embedded.csproj
index 02b95c2..1f53be2 100644
--- a/src/AxonIQ.AxonServer.Embedded/AxonIQ.AxonServer.Embedded.csproj
+++ b/src/AxonIQ.AxonServer.Embedded/AxonIQ.AxonServer.Embedded.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>AxonIQ.AxonServer.Embedded</RootNamespace>
diff --git a/src/Benchmarks/Benchmarks.csproj b/src/Benchmarks/Benchmarks.csproj
index a8253c4..87748b5 100644
--- a/src/Benchmarks/Benchmarks.csproj
+++ b/src/Benchmarks/Benchmarks.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>disable</Nullable>
     </PropertyGroup>
@@ -13,11 +13,11 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-      <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
       <PackageReference Include="OpenTelemetry.Exporter.Zipkin" Version="1.6.0" />
-      <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.0.0-rc9.14" />
-      <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.0.0-rc9.14" />
+      <PackageReference Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.6.0-beta.3" />
+      <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.6.0-beta.3" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Sample/Sample.csproj b/src/Sample/Sample.csproj
index 09ab4f9..4be19fb 100644
--- a/src/Sample/Sample.csproj
+++ b/src/Sample/Sample.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -13,11 +13,11 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-      <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-      <PackageReference Include="Serilog" Version="3.0.1" />
-      <PackageReference Include="Serilog.Extensions.Hosting" Version="5.0.1" />
-      <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
+      <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+      <PackageReference Include="Serilog" Version="3.1.1" />
+      <PackageReference Include="Serilog.Extensions.Hosting" Version="8.0.0" />
+      <PackageReference Include="Serilog.Sinks.Console" Version="5.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/test/AxonIQ.AxonClusterIntegrationTests/AxonIQ.AxonClusterIntegrationTests.csproj b/test/AxonIQ.AxonClusterIntegrationTests/AxonIQ.AxonClusterIntegrationTests.csproj
index e1eda80..a270ce1 100644
--- a/test/AxonIQ.AxonClusterIntegrationTests/AxonIQ.AxonClusterIntegrationTests.csproj
+++ b/test/AxonIQ.AxonClusterIntegrationTests/AxonIQ.AxonClusterIntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <UserSecretsId>633c5eac-a5c9-478c-ae4b-c9fdb8da37ea</UserSecretsId>
@@ -15,18 +15,18 @@
 
     <ItemGroup>
       <PackageReference Include="AutoFixture" Version="4.18.0" />
-      <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />  
-      <PackageReference Include="Xunit" Version="2.5.3" />
-      <PackageReference Include="Xunit.Runner.Console" Version="2.5.3">
+      <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="8.0.0" />  
+      <PackageReference Include="Xunit" Version="2.6.2" />
+      <PackageReference Include="Xunit.Runner.Console" Version="2.6.2">
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         <PrivateAssets>all</PrivateAssets>
       </PackageReference>
-      <PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.3">
+      <PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.4">
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         <PrivateAssets>all</PrivateAssets>
       </PackageReference>
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/AxonIQ.AxonServer.Connector.Tests/AxonIQ.AxonServer.Connector.Tests.csproj b/test/AxonIQ.AxonServer.Connector.Tests/AxonIQ.AxonServer.Connector.Tests.csproj
index 3b1b14e..07763af 100644
--- a/test/AxonIQ.AxonServer.Connector.Tests/AxonIQ.AxonServer.Connector.Tests.csproj
+++ b/test/AxonIQ.AxonServer.Connector.Tests/AxonIQ.AxonServer.Connector.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>AxonIQ.AxonServer.Connector.Tests</RootNamespace>
@@ -21,21 +21,21 @@
         <PackageReference Include="AutoFixture" Version="4.18.0" />
         <PackageReference Include="AutoFixture.Idioms" Version="4.18.0" />
         <PackageReference Include="AutoFixture.Xunit2" Version="4.18.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.1" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" 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="NodaTime" Version="3.1.9" />
         <PackageReference Include="NodaTime.Testing" Version="3.1.9" />
         <PackageReference Include="PublicApiGenerator" Version="11.0.0" />
         <PackageReference Include="shortid" Version="4.0.0" />
         <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-        <PackageReference Include="Verify.Xunit" Version="22.1.4" />
-        <PackageReference Include="Xunit" Version="2.5.3" />
-        <PackageReference Include="Xunit.Runner.Console" Version="2.5.3">
+        <PackageReference Include="Verify.Xunit" Version="22.5.0" />
+        <PackageReference Include="Xunit" Version="2.6.2" />
+        <PackageReference Include="Xunit.Runner.Console" Version="2.6.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.3">
+        <PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/test/AxonIQ.AxonServer.Connector.Tests/AxonServerConnectorOptionsTests.cs b/test/AxonIQ.AxonServer.Connector.Tests/AxonServerConnectorOptionsTests.cs
index 0977ffa..8862130 100644
--- a/test/AxonIQ.AxonServer.Connector.Tests/AxonServerConnectorOptionsTests.cs
+++ b/test/AxonIQ.AxonServer.Connector.Tests/AxonServerConnectorOptionsTests.cs
@@ -409,7 +409,7 @@ public void FromMinimalConfigurationReturnsExpectedResult()
         var component = _fixture.Create<ComponentName>();
         var source = new MemoryConfigurationSource
         {
-            InitialData = new KeyValuePair<string, string>[]
+            InitialData = new KeyValuePair<string, string?>[]
             {
                 new(AxonServerConnectorConfiguration.ComponentName, component.ToString())
             }
@@ -440,7 +440,7 @@ public void FromConfigurationWithClientInstanceIdReturnsExpectedResult()
         var clientInstance = _fixture.Create<ClientInstanceId>();
         var source = new MemoryConfigurationSource
         {
-            InitialData = new KeyValuePair<string, string>[]
+            InitialData = new KeyValuePair<string, string?>[]
             {
                 new(AxonServerConnectorConfiguration.ComponentName, component.ToString()),
                 new(AxonServerConnectorConfiguration.ClientInstanceId, clientInstance.ToString())
diff --git a/test/AxonIQ.AxonServer.Connector.Tests/ServiceCollectionExtensionsTests.cs b/test/AxonIQ.AxonServer.Connector.Tests/ServiceCollectionExtensionsTests.cs
index 75bddab..dbb6400 100644
--- a/test/AxonIQ.AxonServer.Connector.Tests/ServiceCollectionExtensionsTests.cs
+++ b/test/AxonIQ.AxonServer.Connector.Tests/ServiceCollectionExtensionsTests.cs
@@ -281,7 +281,7 @@ private static ConfigurationRoot CreateMinimalConfiguration(ComponentName compon
     {
         var source = new MemoryConfigurationSource
         {
-            InitialData = new KeyValuePair<string, string>[]
+            InitialData = new KeyValuePair<string, string?>[]
             {
                 new(
                     AxonServerConnectorConfiguration.DefaultSection + ":" +
diff --git a/test/AxonIQ.AxonServerIntegrationTests/AxonIQ.AxonServerIntegrationTests.csproj b/test/AxonIQ.AxonServerIntegrationTests/AxonIQ.AxonServerIntegrationTests.csproj
index 5ccc29b..3823dfc 100644
--- a/test/AxonIQ.AxonServerIntegrationTests/AxonIQ.AxonServerIntegrationTests.csproj
+++ b/test/AxonIQ.AxonServerIntegrationTests/AxonIQ.AxonServerIntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
@@ -18,15 +18,15 @@
 
     <ItemGroup>
         <PackageReference Include="System.Linq.Async" Version="6.0.1" />
-        <PackageReference Include="Xunit" Version="2.5.3" />
-        <PackageReference Include="Xunit.Runner.Console" Version="2.5.3">
+        <PackageReference Include="Xunit" Version="2.6.2" />
+        <PackageReference Include="Xunit.Runner.Console" Version="2.6.2">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.3">
+        <PackageReference Include="Xunit.Runner.VisualStudio" Version="2.5.4">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     </ItemGroup>    
 </Project>