From bc0fb88cc4370e3ce291530b41f28ad1d3382220 Mon Sep 17 00:00:00 2001
From: Ian Cooper <ian.cooper@justeattakeaway.com>
Date: Mon, 2 Dec 2024 10:55:44 +0000
Subject: [PATCH 1/2] chore: add net9 to the build dependencies

---
 .github/workflows/ci.yml | 55 ++++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 705205ba99..d17a7d3d77 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,12 +33,12 @@ jobs:
     timeout-minutes: 30
     runs-on: ubuntu-latest
     steps:
-      - name: Setup dotnet 8
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
+            9.0.x
       - run: dotnet --info
       - uses: actions/checkout@v4
         with:
@@ -88,12 +88,12 @@ jobs:
     
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dotnet 8
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: In Memory Transport Tests
@@ -117,12 +117,12 @@ jobs:
       
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dotnet 8
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Redis Transport Tests
@@ -142,11 +142,12 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v4
-      - name: Setup dotnet 6
-        uses: actions/setup-dotnet@v3
+      - name: Setup dotnet 
+        uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
+            8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: MQTT Transport Tests
@@ -171,12 +172,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dotnet 8
+      - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: RMQ Transport Tests
@@ -234,12 +235,12 @@ jobs:
       run: docker ps -a
     - name: Checkout code
       uses: actions/checkout@v4
-    - name: Setup dotnet 8
+    - name: Setup dotnet
       uses: actions/setup-dotnet@v4
       with:
         dotnet-version: |
-          6.0.x
           8.0.x
+          9.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Kafka Transport Tests
@@ -264,12 +265,12 @@ jobs:
           --health-retries 5
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dotnet 8
+      - name: Setup dotnet 
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Postgres Tests
@@ -290,12 +291,12 @@ jobs:
           SA_PASSWORD: Password123!
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dotnet 8
+      - name: Setup dotnet 
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: MSSQL Tests
@@ -318,12 +319,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dotnet 8
+      - name: Setup dotnet 
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Verify MariaDB connection
@@ -349,12 +350,12 @@ jobs:
       
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dotnet 8
+      - name: Setup dotnet 
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: DynamoDB Tests
@@ -372,12 +373,12 @@ jobs:
       
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dotnet 8
+      - name: Setup dotnet 
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Configure AWS Credentials
@@ -399,12 +400,12 @@ jobs:
 
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dotnet 8
+      - name: Setup dotnet 
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Sqlite Tests
@@ -416,12 +417,12 @@ jobs:
     needs: [build]
     steps:
       - uses: actions/checkout@v4
-      - name: Setup dotnet 8
+      - name: Setup dotnet 
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: |
-            6.0.x
             8.0.x
+            9.0.x
       - name: Install dependencies
         run: dotnet restore
       - name: Azure Tests

From 294e38b5395e8891fbd235bfbef7409e6495b3bd Mon Sep 17 00:00:00 2001
From: Ian Cooper <ian.cooper@justeattakeaway.com>
Date: Mon, 2 Dec 2024 18:59:55 +0000
Subject: [PATCH 2/2] chore: update dependencies

---
 Directory.Packages.props | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index fbbe36c771..9b284502b3 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -4,11 +4,11 @@
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="AWSSDK.DynamoDBv2" Version="3.7.403.7" />
+    <PackageVersion Include="AWSSDK.DynamoDBv2" Version="3.7.403.8" />
     <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="3.7.301" />
-    <PackageVersion Include="AWSSDK.S3" Version="3.7.407.1" />
-    <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.6" />
-    <PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.57" />
+    <PackageVersion Include="AWSSDK.S3" Version="3.7.409" />
+    <PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.401.7" />
+    <PackageVersion Include="AWSSDK.SimpleNotificationService" Version="3.7.400.58" />
     <PackageVersion Include="AWSSDK.SQS" Version="3.7.400.57" />
     <PackageVersion Include="Azure.Identity" Version="1.13.1" />
     <PackageVersion Include="Azure.Messaging.ServiceBus" Version="7.18.2" />
@@ -24,7 +24,7 @@
     <PackageVersion Include="Dapper.Contrib" Version="2.0.78" />
     <PackageVersion Include="DapperExtensions" Version="1.7.0" />
     <PackageVersion Include="EventStore.ClientAPI.NetCore" Version="4.1.0.23" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.2" />
+    <PackageVersion Include="FluentAssertions" Version="7.0.0" />
     <PackageVersion Include="FluentMigrator" Version="6.2.0" />
     <PackageVersion Include="FluentMigrator.Runner" Version="6.2.0" />
     <PackageVersion Include="FluentMigrator.Runner.Core" Version="6.2.0" />
@@ -49,7 +49,7 @@
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
     <PackageVersion Include="Microsoft.Extensions.TimeProvider.Testing" Version="9" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageVersion Include="MQTTnet" Version="3.1.2" />
     <PackageVersion Include="MySqlConnector" Version="2.4.0" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
@@ -66,7 +66,7 @@
     <PackageVersion Include="OpenTelemetry.Exporter.Console" Version="1.10.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="1.10.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.Jaeger" Version="1.5.1" />
-    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.10.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.Zipkin" Version="1.9.0" />
     <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.10.0" />
     <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
@@ -83,8 +83,8 @@
     <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
     <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
     <PackageVersion Include="Serilog.Sinks.TestCorrelator" Version="4.0.0" />
-    <PackageVersion Include="ServiceStack.Redis.Core" Version="8.4.0" />
-    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+    <PackageVersion Include="ServiceStack.Redis.Core" Version="8.5.2" />
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="7.1.0" />
     <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
     <PackageVersion Include="System.Reflection.TypeExtensions" Version="4.7.0" />