diff --git a/build/containers-scenarios.yml b/build/containers-scenarios.yml index 9c84e0ed8..8af5b99d1 100644 --- a/build/containers-scenarios.yml +++ b/build/containers-scenarios.yml @@ -82,11 +82,12 @@ parameters: arguments: --scenario fortunes_aspnet_composite --property scenario=FortunesAspNetComposite $(containerDatabaseBuildReuse) condition: Math.round(Date.now() / 43200000) % 8 == 4 # once every 8 half-days - - displayName: Json ASP.NET 8.0 - arguments: --scenario json_aspnet_current --property scenario=JsonAspNet80 + - displayName: Json ASP.NET 10.0 + arguments: --scenario json_aspnet_current --property scenario=JsonAspNet100 condition: Math.round(Date.now() / 43200000) % 8 == 6 # once every 8 half-days - - displayName: Fortunes ASP.NET 8.0 - arguments: --scenario fortunes_aspnet_current --property scenario=FortunesAspNet80 $(containerDatabaseBuildReuse) + + - displayName: Fortunes ASP.NET 10.0 + arguments: --scenario fortunes_aspnet_current --property scenario=FortunesAspNet100 $(containerDatabaseBuildReuse) condition: Math.round(Date.now() / 43200000) % 8 == 6 # once every 8 half-days - displayName: Json NodeJS diff --git a/docker/container-matrix/Middleware-alpine.dockerfile b/docker/container-matrix/Middleware-alpine.dockerfile index 37d43fabe..115acdf6a 100644 --- a/docker/container-matrix/Middleware-alpine.dockerfile +++ b/docker/container-matrix/Middleware-alpine.dockerfile @@ -1,11 +1,10 @@ -FROM mcr.microsoft.com/dotnet/nightly/sdk:latest AS build +FROM mcr.microsoft.com/dotnet/nightly/sdk:11.0 AS build WORKDIR /app COPY . . -RUN dotnet publish src/Benchmarks/Benchmarks.csproj -c Release -o out -f net10.0 -p:BenchmarksTargetFramework=net10.0 -p:MicrosoftAspNetCoreAppPackageVersion=$ASPNET_VERSION +RUN dotnet publish src/Benchmarks/Benchmarks.csproj -c Release -o out -f net11.0 -p:BenchmarksTargetFramework=net11.0 -p:MicrosoftAspNetCoreAppPackageVersion=$ASPNET_VERSION -FROM mcr.microsoft.com/dotnet/nightly/aspnet:10.0-preview-alpine AS runtime +FROM mcr.microsoft.com/dotnet/nightly/aspnet:11.0-alpine AS runtime WORKDIR /app COPY --from=build /app/out ./ ENTRYPOINT ["dotnet", "Benchmarks.dll" ] - diff --git a/docker/container-matrix/Middleware-composite.dockerfile b/docker/container-matrix/Middleware-composite.dockerfile index be0fda16c..36a952e24 100644 --- a/docker/container-matrix/Middleware-composite.dockerfile +++ b/docker/container-matrix/Middleware-composite.dockerfile @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/nightly/sdk:latest AS build +FROM mcr.microsoft.com/dotnet/nightly/sdk:11.0 AS build WORKDIR /app COPY . . -RUN dotnet publish src/Benchmarks/Benchmarks.csproj -c Release -o out -f net10.0 -p:BenchmarksTargetFramework=net10.0 -p:MicrosoftAspNetCoreAppPackageVersion=$ASPNET_VERSION +RUN dotnet publish src/Benchmarks/Benchmarks.csproj -c Release -o out -f net11.0 -p:BenchmarksTargetFramework=net11.0 -p:MicrosoftAspNetCoreAppPackageVersion=$ASPNET_VERSION -FROM mcr.microsoft.com/dotnet/nightly/aspnet:10.0-preview-alpine-composite AS runtime +FROM mcr.microsoft.com/dotnet/nightly/aspnet:11.0-alpine-composite AS runtime WORKDIR /app COPY --from=build /app/out ./ diff --git a/docker/container-matrix/Middleware-current.dockerfile b/docker/container-matrix/Middleware-current.dockerfile index 73f099430..a373cb57d 100644 --- a/docker/container-matrix/Middleware-current.dockerfile +++ b/docker/container-matrix/Middleware-current.dockerfile @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:10.0 AS build WORKDIR /app COPY . . -RUN dotnet publish src/Benchmarks/Benchmarks.csproj -c Release -o out -f net9.0 /p:BenchmarksTargetFramework=net9.0 /p:MicrosoftAspNetCoreAppPackageVersion=$ASPNET_VERSION +RUN dotnet publish src/Benchmarks/Benchmarks.csproj -c Release -o out -f net10.0 /p:BenchmarksTargetFramework=net10.0 /p:MicrosoftAspNetCoreAppPackageVersion=$ASPNET_VERSION -FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS runtime +FROM mcr.microsoft.com/dotnet/aspnet:10.0 AS runtime # ENV ASPNETCORE_URLS http://*:5000 WORKDIR /app COPY --from=build /app/out ./ diff --git a/docker/container-matrix/Middleware.dockerfile b/docker/container-matrix/Middleware.dockerfile index ba75c2614..f7f020513 100644 --- a/docker/container-matrix/Middleware.dockerfile +++ b/docker/container-matrix/Middleware.dockerfile @@ -1,9 +1,9 @@ -FROM mcr.microsoft.com/dotnet/nightly/sdk:latest AS build +FROM mcr.microsoft.com/dotnet/nightly/sdk:11.0 AS build WORKDIR /app COPY . . -RUN dotnet publish src/Benchmarks/Benchmarks.csproj -c Release -o out -f net10.0 /p:BenchmarksTargetFramework=net10.0 /p:MicrosoftAspNetCoreAppPackageVersion=$ASPNET_VERSION +RUN dotnet publish src/Benchmarks/Benchmarks.csproj -c Release -o out -f net11.0 /p:BenchmarksTargetFramework=net11.0 /p:MicrosoftAspNetCoreAppPackageVersion=$ASPNET_VERSION -FROM mcr.microsoft.com/dotnet/nightly/aspnet:latest AS runtime +FROM mcr.microsoft.com/dotnet/nightly/aspnet:11.0 AS runtime # ENV ASPNETCORE_URLS http://*:5000 WORKDIR /app COPY --from=build /app/out ./