Merge pull request #21 from eventuate-tram/Dotnet8Upgrade

Dotnet8 upgrade
eventuate-tram · May 3, 2024 · 17da96b · 17da96b
2 parents b96ff7f + bbcfeba
commit 17da96b
Show file tree

Hide file tree

Showing 27 changed files with 1,225 additions and 1,186 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,10 +16,10 @@ jobs:
     - name: Checkout source
       uses: actions/checkout@v4
 
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 6.0.414
+        dotnet-version: 8.0.204
 
     - name: Build
       env:
@@ -29,7 +29,7 @@ jobs:
       run: ./build.sh
 
     - name: Upload bin folder
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: bin
         path: IO.Eventuate.Tram/bin
@@ -38,7 +38,7 @@ jobs:
       run: dotnet test -c Release --no-build --verbosity normal --logger trx IO.Eventuate.Tram.UnitTests/
 
     - name: Upload unit test results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: unit-test-results
@@ -57,11 +57,11 @@ jobs:
         docker stats --no-stream --all
 
     - name: Upload integration test results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: integration-test-results
-        path: IO.Eventuate.Tram.IntegrationTests/bin/Release/net6.0/TestResults
+        path: IO.Eventuate.Tram.IntegrationTests/bin/Release/net8.0/TestResults
 
     - name: Publish nuget package
       # Don't publish nuget packages for builds triggered by pull requests (pull requests from forks won't have access to secrets anyway)

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Changed
+- Upgraded target framework to net8.0
+- Upgraded Microsoft package dependencies to 8.0 versions
+- Upgraded Confluent.Kafka package to version 2.3.0
+
 ## [0.3.0] - 2023-09-20
 
 ### Added

diff --git a/IO.Eventuate.Tram.IntegrationTests/IO.Eventuate.Tram.IntegrationTests.csproj b/IO.Eventuate.Tram.IntegrationTests/IO.Eventuate.Tram.IntegrationTests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
@@ -23,12 +23,12 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.16" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
-    <PackageReference Include="Confluent.Kafka" Version="2.1.1" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.4" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="Confluent.Kafka" Version="2.3.0" />
+    <PackageReference Include="NUnit" Version="4.1.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
   </ItemGroup>
 

diff --git a/IO.Eventuate.Tram.IntegrationTests/TestFixtures/BadSchemaIntegrationTests.cs b/IO.Eventuate.Tram.IntegrationTests/TestFixtures/BadSchemaIntegrationTests.cs
@@ -7,33 +7,33 @@
 
 namespace IO.Eventuate.Tram.IntegrationTests.TestFixtures
 {
-    [TestFixture]
-    public class BadSchemaIntegrationTests : IntegrationTestsBase
-    {
-        [SetUp]
-        public void Setup()
-        {
-            TestSetup("badschema", false, EventuateKafkaConsumerConfigurationProperties.Empty());
-        }
+	[TestFixture]
+	public class BadSchemaIntegrationTests : IntegrationTestsBase
+	{
+		[SetUp]
+		public void Setup()
+		{
+			TestSetup("badschema", false, EventuateKafkaConsumerConfigurationProperties.Empty());
+		}
 
-        [TearDown]
-        public void TearDown()
-        {
-            DisposeTestHost();
-        }
+		[TearDown]
+		public void TearDown()
+		{
+			DisposeTestHost();
+		}
 
-        [Test]
-        public void Publish_DatabaseSchemaNotCreated_ThrowsException()
-        {
-            // Arrange
-            TestMessageType1 msg1 = new TestMessageType1("Msg1", 1, 1.2);
-            TestEventConsumer consumer = GetTestConsumer();
+		[Test]
+		public void Publish_DatabaseSchemaNotCreated_ThrowsException()
+		{
+			// Arrange
+			TestMessageType1 msg1 = new TestMessageType1("Msg1", 1, 1.2);
+			TestEventConsumer consumer = GetTestConsumer();
 
-            // Act
-            Assert.Throws<DbUpdateException>(delegate ()
-            {
-                GetTestPublisher().Publish(AggregateType12, AggregateType12, new List<IDomainEvent> { msg1 });
-            });
-        }
-    }
-}
+			// Act
+			Assert.Throws<DbUpdateException>(delegate()
+			{
+				GetTestPublisher().Publish(AggregateType12, AggregateType12, new List<IDomainEvent> { msg1 });
+			});
+		}
+	}
+}