chore: upgrade templates to net8.0 (arcus-azure#873)

* chore: upgrade templates to net8.0 * pr-fix: use net8.0 in ci build * pr-fix: use diff dotnet import for docker tests * pr-fix: remove arcus evengrid from integration tests * pr-fix: remove arcus eventgrid packages implicit references * pr-fix: remove dotnet install in docker integration tests * pr-fix: use automatic topic subscription * pr-fix: update Dockerfiles * pr-revert: program file improvements * pr-revert: unnecessary blank space in program * pr-fix: remove pinned az cli tool * pr-temp: verify if the problem is timeout * pr-fix: remove eventgrid from servicebus test message hanlder * pr-fix: simplify worker projects w/o eventgrid references * pr-add: write log message upon message processing
stijnmoreels · May 23, 2024 · 051636f · 051636f
1 parent 6dab27d
commit 051636f
Show file tree

Hide file tree

Showing 39 changed files with 239 additions and 304 deletions.
diff --git a/build/ci-build.yml b/build/ci-build.yml
@@ -89,8 +89,6 @@ stages:
         steps:
           - task: FuncToolsInstaller@0
             displayName: 'Install Azure Functions Core tools'
-            inputs:
-              version: '4.0.5390'
           - template: test/run-integration-tests.yml@templates
             parameters:
               dotnetSdkVersion: '$(DotNet.Sdk.Version)'

diff --git a/build/templates/docker-integration-tests.yml b/build/templates/docker-integration-tests.yml
@@ -14,10 +14,6 @@ stages:
             inputs:
               artifact: 'Templates'
               path: '$(Build.SourcesDirectory)/templates'
-          - task: DotNetCoreInstaller@0
-            displayName: 'Import .NET Core SDK ($(DotNet.Sdk.Version))'
-            inputs:
-              version: '$(DotNet.Sdk.Version)'
           - task: DotNetCoreCLI@2
             displayName: 'Install template'
             inputs:

diff --git a/build/variables/build.yml b/build/variables/build.yml
@@ -1,4 +1,4 @@
 variables:
-  DotNet.Sdk.Version: '6.0.100'
+  DotNet.Sdk.Version: '8.0.x'
   Project: 'Arcus.Templates'
   Vm.Image: 'ubuntu-latest'
diff --git a/src/Arcus.Templates.AzureFunctions.EventHubs/Arcus.Templates.AzureFunctions.EventHubs.csproj b/src/Arcus.Templates.AzureFunctions.EventHubs/Arcus.Templates.AzureFunctions.EventHubs.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -47,16 +47,16 @@
   <!--#endif-->
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Messaging.Abstractions.EventHubs" Version="1.4.0" />
-    <PackageReference Include="Arcus.Messaging.AzureFunctions.EventHubs" Version="1.4.0" />
-    <PackageReference Include="Arcus.Messaging.EventHubs.Core" Version="1.4.0" />
-    <PackageReference Include="Arcus.Observability.Correlation" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.AzureFunctions" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Security.AzureFunctions" Version="1.9.0" />
-    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="1.9.0" />
+    <PackageReference Include="Arcus.Messaging.Abstractions.EventHubs" Version="2.0.0" />
+    <PackageReference Include="Arcus.Messaging.AzureFunctions.EventHubs" Version="2.0.0" />
+    <PackageReference Include="Arcus.Messaging.EventHubs.Core" Version="2.0.0" />
+    <PackageReference Include="Arcus.Observability.Correlation" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.AzureFunctions" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Security.AzureFunctions" Version="2.0.0" />
+    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.22.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.EventHubs" Version="6.3.1" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.17.2" />

diff --git a/src/Arcus.Templates.AzureFunctions.EventHubs/Dockerfile b/src/Arcus.Templates.AzureFunctions.EventHubs/Dockerfile
@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/azure-functions/dotnet:4 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0.203-bullseye-slim AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
 WORKDIR /src
 COPY ["Arcus.Templates.AzureFunctions.EventHubs.csproj", ""]
 

diff --git a/src/Arcus.Templates.AzureFunctions.EventHubs/SensorReadingFunction.cs b/src/Arcus.Templates.AzureFunctions.EventHubs/SensorReadingFunction.cs
@@ -15,6 +15,7 @@ namespace Arcus.Templates.AzureFunctions.EventHubs
 {
     public class SensorReadingFunction
     {
+        private readonly string _jobId = Guid.NewGuid().ToString();
         private readonly IAzureEventHubsMessageRouter _messageRouter;
 
         /// <summary>
@@ -49,7 +50,7 @@ public async Task Run(
                 Dictionary<string, JsonElement> properties = propertiesArray[index];
                 EventData data = CreateEventData(message, properties);
 
-                AzureEventHubsMessageContext messageContext = data.GetMessageContext("sensor-reading.servicebus.windows.net", "sensors");
+                AzureEventHubsMessageContext messageContext = data.GetMessageContext("sensor-reading.servicebus.windows.net", "sensors", "$Default", _jobId);
                 using (MessageCorrelationResult result = executionContext.GetCorrelationInfo(properties))
                 {
                     await _messageRouter.RouteMessageAsync(data, messageContext, result.CorrelationInfo, CancellationToken.None);

diff --git a/src/Arcus.Templates.AzureFunctions.Http/Arcus.Templates.AzureFunctions.Http.csproj b/src/Arcus.Templates.AzureFunctions.Http/Arcus.Templates.AzureFunctions.Http.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <OutputType>Exe</OutputType>
@@ -46,7 +46,7 @@
   <ItemGroup>
     <None Include="..\..\README.md" Pack="true" PackagePath="\" />
     <None Include="..\..\LICENSE" Pack="true" PackagePath="\" />
-    <None Include="..\..\docs\static\img\icon.png" Pack="true" PackagePath="\"/>
+    <None Include="..\..\docs\static\img\icon.png" Pack="true" PackagePath="\" />
   </ItemGroup>
   <!--#endif-->
 
@@ -61,16 +61,16 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Observability.Correlation" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.AspNetCore" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.AzureFunctions" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.Applicationinsights" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Security.AzureFunctions" Version="1.9.0" />
-    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="1.9.0" />
-    <PackageReference Include="Arcus.WebApi.Hosting.AzureFunctions" Version="1.7.1" />
-    <PackageReference Include="Arcus.WebApi.Logging.AzureFunctions" Version="1.7.1" />
+    <PackageReference Include="Arcus.Observability.Correlation" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.AspNetCore" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.AzureFunctions" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.Applicationinsights" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Security.AzureFunctions" Version="2.0.0" />
+    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="2.0.0" />
+    <PackageReference Include="Arcus.WebApi.Hosting.AzureFunctions" Version="2.0.0" />
+    <PackageReference Include="Arcus.WebApi.Logging.AzureFunctions" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.19.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.Http" Version="3.0.13" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.OpenApi" Version="1.5.1" Condition="'$(OpenApi)' == 'true'" />

diff --git a/src/Arcus.Templates.AzureFunctions.Http/Dockerfile b/src/Arcus.Templates.AzureFunctions.Http/Dockerfile
@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/azure-functions/dotnet:4 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0.203-bullseye-slim AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
 WORKDIR /src
 COPY ["Arcus.Templates.AzureFunctions.Http.csproj", ""]
 

diff --git a/...es.AzureFunctions.ServiceBus.Queue/Arcus.Templates.AzureFunctions.ServiceBus.Queue.csproj b/...es.AzureFunctions.ServiceBus.Queue/Arcus.Templates.AzureFunctions.ServiceBus.Queue.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -48,15 +48,15 @@
   <!--#endif-->
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Messaging.Abstractions.ServiceBus" Version="1.4.0" />
-    <PackageReference Include="Arcus.Messaging.AzureFunctions.ServiceBus" Version="1.4.0" />
-    <PackageReference Include="Arcus.Observability.Correlation" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.AzureFunctions" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Security.AzureFunctions" Version="1.9.0" />
-    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="1.9.0" />
+    <PackageReference Include="Arcus.Messaging.Abstractions.ServiceBus" Version="2.0.0" />
+    <PackageReference Include="Arcus.Messaging.AzureFunctions.ServiceBus" Version="2.0.0" />
+    <PackageReference Include="Arcus.Observability.Correlation" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.AzureFunctions" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Security.AzureFunctions" Version="2.0.0" />
+    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.19.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.7.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.15.0" />

diff --git a/src/Arcus.Templates.AzureFunctions.ServiceBus.Queue/Dockerfile b/src/Arcus.Templates.AzureFunctions.ServiceBus.Queue/Dockerfile
@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/azure-functions/dotnet:4 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0.203-bullseye-slim AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
 WORKDIR /src
 COPY ["Arcus.Templates.AzureFunctions.ServiceBus.Queue.csproj", ""]
 

diff --git a/...es.AzureFunctions.ServiceBus.Topic/Arcus.Templates.AzureFunctions.ServiceBus.Topic.csproj b/...es.AzureFunctions.ServiceBus.Topic/Arcus.Templates.AzureFunctions.ServiceBus.Topic.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <AzureFunctionsVersion>v4</AzureFunctionsVersion>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
@@ -47,15 +47,15 @@
   <!--#endif-->
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Messaging.Abstractions.ServiceBus" Version="1.4.0" />
-    <PackageReference Include="Arcus.Messaging.AzureFunctions.ServiceBus" Version="1.4.0" />
-    <PackageReference Include="Arcus.Observability.Correlation" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.AzureFunctions" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Security.AzureFunctions" Version="1.9.0" />
-    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="1.9.0" />
+    <PackageReference Include="Arcus.Messaging.Abstractions.ServiceBus" Version="2.0.0" />
+    <PackageReference Include="Arcus.Messaging.AzureFunctions.ServiceBus" Version="2.0.0" />
+    <PackageReference Include="Arcus.Observability.Correlation" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.AzureFunctions" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Security.AzureFunctions" Version="2.0.0" />
+    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="2.0.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.19.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.7.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.15.0" />

diff --git a/src/Arcus.Templates.AzureFunctions.ServiceBus.Topic/Dockerfile b/src/Arcus.Templates.AzureFunctions.ServiceBus.Topic/Dockerfile
@@ -2,7 +2,7 @@ FROM mcr.microsoft.com/azure-functions/dotnet:4 AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:7.0.203-bullseye-slim AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-bookworm-slim AS build
 WORKDIR /src
 COPY ["Arcus.Templates.AzureFunctions.ServiceBus.Topic.csproj", ""]
 

diff --git a/src/Arcus.Templates.EventHubs/Arcus.Templates.EventHubs.csproj b/src/Arcus.Templates.EventHubs/Arcus.Templates.EventHubs.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <!--#if (AuthoringMode)-->
     <Authors>Arcus</Authors>
@@ -49,15 +49,14 @@
   <!--#endif-->
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Messaging.EventHubs.Core" Version="1.4.0" />
-    <PackageReference Include="Arcus.Messaging.Health" Version="1.4.0" />
-    <PackageReference Include="Arcus.Messaging.Pumps.EventHubs" Version="1.4.0" />
-    <PackageReference Include="Arcus.Observability.Correlation" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Security.Core" Version="1.9.0" />
-    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="1.9.0" />
+    <PackageReference Include="Arcus.Messaging.EventHubs.Core" Version="2.0.0" />
+    <PackageReference Include="Arcus.Messaging.Health" Version="2.0.0" />
+    <PackageReference Include="Arcus.Messaging.Pumps.EventHubs" Version="2.0.0" />
+    <PackageReference Include="Arcus.Observability.Correlation" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="2.0.0" />
     <PackageReference Include="Guard.NET" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />

diff --git a/src/Arcus.Templates.EventHubs/Dockerfile b/src/Arcus.Templates.EventHubs/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.301-alpine3.14 AS base
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0.301-alpine3.14 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
 WORKDIR /src
 COPY ["Arcus.Templates.EventHubs.csproj", ""]
 

diff --git a/src/Arcus.Templates.ServiceBus.Queue/Arcus.Templates.ServiceBus.Queue.csproj b/src/Arcus.Templates.ServiceBus.Queue/Arcus.Templates.ServiceBus.Queue.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Worker">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <!--#if (AuthoringMode)-->
     <Authors>Arcus</Authors>
@@ -49,14 +49,13 @@
   <!--#endif-->
 
   <ItemGroup>
-    <PackageReference Include="Arcus.Messaging.Health" Version="1.4.0" />
-    <PackageReference Include="Arcus.Messaging.Pumps.ServiceBus" Version="1.4.0" />
-    <PackageReference Include="Arcus.Observability.Correlation" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="2.8.0" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="2.8.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
-    <PackageReference Include="Arcus.Security.Core" Version="1.9.0" />
-    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="1.9.0" />
+    <PackageReference Include="Arcus.Messaging.Health" Version="2.0.0" />
+    <PackageReference Include="Arcus.Messaging.Pumps.ServiceBus" Version="2.0.0" />
+    <PackageReference Include="Arcus.Observability.Correlation" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Core" Version="3.0.0" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Filters" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Observability.Telemetry.Serilog.Sinks.ApplicationInsights" Version="3.0.0" Condition="'$(Serilog_AppInsights)' == 'true'" />
+    <PackageReference Include="Arcus.Security.Providers.AzureKeyVault" Version="2.0.0" />
     <PackageReference Include="Guard.NET" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />

diff --git a/src/Arcus.Templates.ServiceBus.Queue/Dockerfile b/src/Arcus.Templates.ServiceBus.Queue/Dockerfile
@@ -1,8 +1,8 @@
-FROM mcr.microsoft.com/dotnet/sdk:6.0.301-alpine3.14 AS base
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS base
 WORKDIR /app
 EXPOSE 80
 
-FROM mcr.microsoft.com/dotnet/sdk:6.0.301-alpine3.14 AS build
+FROM mcr.microsoft.com/dotnet/sdk:8.0-alpine AS build
 WORKDIR /src
 COPY ["Arcus.Templates.ServiceBus.Queue.csproj", ""]