Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: upgrade templates to net8.0 #873

Merged
merged 16 commits into from
May 23, 2024
Merged

chore: upgrade templates to net8.0 #873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
5aa5c59
chore: upgrade templates to net8.0
stijnmoreels May 7, 2024
f41d1b0
pr-fix: use net8.0 in ci build
stijnmoreels May 7, 2024
5fe4af7
pr-fix: use diff dotnet import for docker tests
stijnmoreels May 7, 2024
a2357d1
pr-fix: remove arcus evengrid from integration tests
stijnmoreels May 7, 2024
a3c3faf
pr-fix: remove arcus eventgrid packages implicit references
stijnmoreels May 8, 2024
468a3d5
pr-fix: remove dotnet install in docker integration tests
stijnmoreels May 9, 2024
dde5c76
pr-fix: use automatic topic subscription
stijnmoreels May 9, 2024
e264d5b
pr-fix: update Dockerfiles
stijnmoreels May 9, 2024
722385d
pr-revert: program file improvements
stijnmoreels May 9, 2024
e01d30e
pr-revert: unnecessary blank space in program
stijnmoreels May 9, 2024
0a0cd86
pr-fix: remove pinned az cli tool
stijnmoreels May 10, 2024
7f2d85c
pr-temp: verify if the problem is timeout
stijnmoreels May 15, 2024
ba5b119
Merge branch 'chore/upgrade-templates-to-net8.0' of https://github.co…
stijnmoreels May 15, 2024
7a1f373
pr-fix: remove eventgrid from servicebus test message hanlder
stijnmoreels May 15, 2024
2fee3aa
pr-fix: simplify worker projects w/o eventgrid references
stijnmoreels May 15, 2024
c67b242
pr-add: write log message upon message processing
stijnmoreels May 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions build/ci-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,6 @@ stages:
steps:
- task: FuncToolsInstaller@0
displayName: 'Install Azure Functions Core tools'
inputs:
version: '4.0.5390'
fgheysels marked this conversation as resolved.
Show resolved Hide resolved
- template: test/run-integration-tests.yml@templates
parameters:
dotnetSdkVersion: '$(DotNet.Sdk.Version)'
Expand Down
4 changes: 0 additions & 4 deletions build/templates/docker-integration-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ stages:
inputs:
artifact: 'Templates'
path: '$(Build.SourcesDirectory)/templates'
- task: DotNetCoreInstaller@0
fgheysels marked this conversation as resolved.
Show resolved Hide resolved
displayName: 'Import .NET Core SDK ($(DotNet.Sdk.Version))'
inputs:
version: '$(DotNet.Sdk.Version)'
- task: DotNetCoreCLI@2
displayName: 'Install template'
inputs:
Expand Down
2 changes: 1 addition & 1 deletion build/variables/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
variables:
DotNet.Sdk.Version: '6.0.100'
DotNet.Sdk.Version: '8.0.x'
Project: 'Arcus.Templates'
Vm.Image: 'ubuntu-latest'
22 changes: 11 additions & 11 deletions src/Arcus.Templates.AzureFunctions.EventHubs/Arcus.Templates.AzureFunctions.EventHubs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion src/Arcus.Templates.AzureFunctions.EventHubs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
stijnmoreels marked this conversation as resolved.
Show resolved Hide resolved
WORKDIR /src
COPY ["Arcus.Templates.AzureFunctions.EventHubs.csproj", ""]

Expand Down
3 changes: 2 additions & 1 deletion src/Arcus.Templates.AzureFunctions.EventHubs/SensorReadingFunction.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ namespace Arcus.Templates.AzureFunctions.EventHubs
{
public class SensorReadingFunction
{
private readonly string _jobId = Guid.NewGuid().ToString();
private readonly IAzureEventHubsMessageRouter _messageRouter;

/// <summary>
Expand Down Expand Up @@ -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);
Expand Down
24 changes: 12 additions & 12 deletions src/Arcus.Templates.AzureFunctions.Http/Arcus.Templates.AzureFunctions.Http.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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-->

Expand All @@ -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'" />
Expand Down
2 changes: 1 addition & 1 deletion src/Arcus.Templates.AzureFunctions.Http/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/azure-functions/dotnet:4 AS base
WORKDIR /app
stijnmoreels marked this conversation as resolved.
Show resolved Hide resolved
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", ""]

Expand Down
20 changes: 10 additions & 10 deletions ...es.AzureFunctions.ServiceBus.Queue/Arcus.Templates.AzureFunctions.ServiceBus.Queue.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion src/Arcus.Templates.AzureFunctions.ServiceBus.Queue/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/azure-functions/dotnet:4 AS base
WORKDIR /app
stijnmoreels marked this conversation as resolved.
Show resolved Hide resolved
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", ""]

Expand Down
20 changes: 10 additions & 10 deletions ...es.AzureFunctions.ServiceBus.Topic/Arcus.Templates.AzureFunctions.ServiceBus.Topic.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion src/Arcus.Templates.AzureFunctions.ServiceBus.Topic/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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", ""]

Expand Down
19 changes: 9 additions & 10 deletions src/Arcus.Templates.EventHubs/Arcus.Templates.EventHubs.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/Arcus.Templates.EventHubs/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
stijnmoreels marked this conversation as resolved.
Show resolved Hide resolved
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", ""]

Expand Down
17 changes: 8 additions & 9 deletions src/Arcus.Templates.ServiceBus.Queue/Arcus.Templates.ServiceBus.Queue.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
Expand Down Expand Up @@ -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" />
Expand Down
4 changes: 2 additions & 2 deletions src/Arcus.Templates.ServiceBus.Queue/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
stijnmoreels marked this conversation as resolved.
Show resolved Hide resolved
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", ""]

Expand Down
Loading
Loading