From 0953eb0ef8f092f3fe81d93e9bbb2f6d9a242619 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Fri, 5 Jun 2026 15:01:24 -0700 Subject: [PATCH] Update Aspire Dashboard to 13.5 Preview --- README.aspire-dashboard.md | 4 ++-- eng/update-dependencies/BuildExtensions.cs | 1 + manifest.versions.json | 12 ++++++------ src/aspire-dashboard/amd64/Dockerfile | 4 ++-- src/aspire-dashboard/arm64v8/Dockerfile | 4 ++-- tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs | 1 + tests/Microsoft.DotNet.Docker.Tests/TestData.cs | 4 ++-- 7 files changed, 16 insertions(+), 14 deletions(-) diff --git a/README.aspire-dashboard.md b/README.aspire-dashboard.md index 480a9818b1..a86f914e10 100644 --- a/README.aspire-dashboard.md +++ b/README.aspire-dashboard.md @@ -119,13 +119,13 @@ Limits are per-resource. For example, a `MaxLogCount` value of 10,000 configures Tags | Dockerfile | OS Version ---- | ---------- | ---------- -13.3.0, 13.3, 13, latest | [Dockerfile](src/aspire-dashboard/amd64/Dockerfile) | Azure Linux 3.0 +13.5.0, 13.5, 13, latest | [Dockerfile](src/aspire-dashboard/amd64/Dockerfile) | Azure Linux 3.0 ### Linux arm64 Tags Tags | Dockerfile | OS Version ---- | ---------- | ---------- -13.3.0, 13.3, 13, latest | [Dockerfile](src/aspire-dashboard/arm64v8/Dockerfile) | Azure Linux 3.0 +13.5.0, 13.5, 13, latest | [Dockerfile](src/aspire-dashboard/arm64v8/Dockerfile) | Azure Linux 3.0 diff --git a/eng/update-dependencies/BuildExtensions.cs b/eng/update-dependencies/BuildExtensions.cs index d1a1aa9de0..729d19a75f 100644 --- a/eng/update-dependencies/BuildExtensions.cs +++ b/eng/update-dependencies/BuildExtensions.cs @@ -21,6 +21,7 @@ public static BuildRepo GetBuildRepo(this Build build) { "https://github.com/dotnet/dotnet" or "https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet" => BuildRepo.Vmr, "https://github.com/dotnet/aspire" or "https://dev.azure.com/dnceng/internal/_git/dotnet-aspire" => BuildRepo.Aspire, + "https://github.com/microsoft/aspire" or "https://dev.azure.com/dnceng/internal/_git/microsoft-aspire" => BuildRepo.Aspire, _ => throw new InvalidOperationException($"Build {build.Id} was from unsupported repository '{repo}'"), }; } diff --git a/manifest.versions.json b/manifest.versions.json index f3a887b8c1..6021a1d1d8 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -21,13 +21,13 @@ "alpine|9.0|floating-tag-version": "$(alpine|floating-tag-version)", "alpine|8.0|floating-tag-version": "$(alpine|floating-tag-version)", - "aspire-dashboard|build-version": "13.3.0-preview.1.26256.5", - "aspire-dashboard|product-version": "13.3.0", - "aspire-dashboard|fixed-tag": "$(aspire-dashboard|product-version)", - "aspire-dashboard|minor-tag": "13.3", + "aspire-dashboard|build-version": "13.5.0-preview.1.26305.5", + "aspire-dashboard|product-version": "13.5.0", + "aspire-dashboard|fixed-tag": "13.5.0", + "aspire-dashboard|minor-tag": "13.5", "aspire-dashboard|major-tag": "13", - "aspire-dashboard|linux|x64|sha": "cfafa97f3d8bca6a3e0d20d29d5d1a2c119ac2fd45650569bc596182598603512f46df91fd623d5818ed5795816419ddd7a0bd30b831df44e3256fcb30021557", - "aspire-dashboard|linux|arm64|sha": "e03dd6d54b9df414a70ffa16d962dddb4b83c516c8e8342ccf57aafb24c7c80fc3f0938ef98b2c1c7edbe221aa48cf66f302b719facffc62f2229356639667ac", + "aspire-dashboard|linux|x64|sha": "c69f187235dfaca3efe8ea3981a47aa0114804e9c4e00c065e5ad4414702d833b46a3c0ebdc9797b2808ef16c34f7539ba37b146f4990cf802dd6908ff6b23db", + "aspire-dashboard|linux|arm64|sha": "aedfc48a3635fc417c2da72b4e3cfd0463856debdaad100c4672a89f1012241d88363c166bfd38a73daae83957143c4ce4a3632f3138c3d2922755433f96ee28", "aspire-dashboard|base-url|main": "$(base-url|public|preview|nightly)", "aspire-dashboard|base-url|nightly": "$(base-url|public|preview|nightly)", diff --git a/src/aspire-dashboard/amd64/Dockerfile b/src/aspire-dashboard/amd64/Dockerfile index 2f94ef1af1..902184ece6 100644 --- a/src/aspire-dashboard/amd64/Dockerfile +++ b/src/aspire-dashboard/amd64/Dockerfile @@ -9,9 +9,9 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve Aspire Dashboard -RUN dotnet_aspire_version=13.3.0-preview.1.26256.5 \ +RUN dotnet_aspire_version=13.5.0-preview.1.26305.5 \ && curl --fail --show-error --location --output aspire_dashboard.zip https://ci.dot.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-x64.zip \ - && aspire_dashboard_sha512='cfafa97f3d8bca6a3e0d20d29d5d1a2c119ac2fd45650569bc596182598603512f46df91fd623d5818ed5795816419ddd7a0bd30b831df44e3256fcb30021557' \ + && aspire_dashboard_sha512='c69f187235dfaca3efe8ea3981a47aa0114804e9c4e00c065e5ad4414702d833b46a3c0ebdc9797b2808ef16c34f7539ba37b146f4990cf802dd6908ff6b23db' \ && echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \ && mkdir --parents /app \ && unzip aspire_dashboard.zip -d /app \ diff --git a/src/aspire-dashboard/arm64v8/Dockerfile b/src/aspire-dashboard/arm64v8/Dockerfile index 29e8b5d83e..b79ee0c632 100644 --- a/src/aspire-dashboard/arm64v8/Dockerfile +++ b/src/aspire-dashboard/arm64v8/Dockerfile @@ -9,9 +9,9 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve Aspire Dashboard -RUN dotnet_aspire_version=13.3.0-preview.1.26256.5 \ +RUN dotnet_aspire_version=13.5.0-preview.1.26305.5 \ && curl --fail --show-error --location --output aspire_dashboard.zip https://ci.dot.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-arm64.zip \ - && aspire_dashboard_sha512='e03dd6d54b9df414a70ffa16d962dddb4b83c516c8e8342ccf57aafb24c7c80fc3f0938ef98b2c1c7edbe221aa48cf66f302b719facffc62f2229356639667ac' \ + && aspire_dashboard_sha512='aedfc48a3635fc417c2da72b4e3cfd0463856debdaad100c4672a89f1012241d88363c166bfd38a73daae83957143c4ce4a3632f3138c3d2922755433f96ee28' \ && echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \ && mkdir --parents /app \ && unzip aspire_dashboard.zip -d /app \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs index 4c7374c47a..44fe4c5832 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs @@ -16,6 +16,7 @@ public readonly record struct ImageVersion public static readonly ImageVersion V9_1 = new(new Version(9, 1), isPreview: false); public static readonly ImageVersion V13_2 = new(new Version(13, 2), isPreview: false); public static readonly ImageVersion V13_3 = new(new Version(13, 3), isPreview: false); + public static readonly ImageVersion V13_5 = new(new Version(13, 5), isPreview: false); public static readonly ImageVersion V9_2_Preview = new(new Version(9, 2), isPreview: true); public static readonly ImageVersion V10_0 = new(new Version(10, 0), isPreview: false); public static readonly ImageVersion V11_0 = new(new Version(11, 0), isPreview: true); diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs index 16a8859b5f..cebcb785f2 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs @@ -469,7 +469,7 @@ public static class TestData private static readonly ProductImageData[] s_AspireDashboardTestData = { new() { - Version = V13_3, + Version = V13_5, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSTag = "", @@ -478,7 +478,7 @@ public static class TestData SupportedImageRepos = DotNetImageRepo.Aspire_Dashboard, }, new() { - Version = V13_3, + Version = V13_5, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSTag = "",