diff --git a/.portal-docs/docker-hub/README.aspire-dashboard.md b/.portal-docs/docker-hub/README.aspire-dashboard.md index 5286415708..1d291630cc 100644 --- a/.portal-docs/docker-hub/README.aspire-dashboard.md +++ b/.portal-docs/docker-hub/README.aspire-dashboard.md @@ -4,8 +4,8 @@ # Featured Tags -* `9.2` - * `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.2` +* `9.3` + * `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.3` # About diff --git a/.portal-docs/mar/README.aspire-dashboard.portal.md b/.portal-docs/mar/README.aspire-dashboard.portal.md index af1958b217..6e3f318008 100644 --- a/.portal-docs/mar/README.aspire-dashboard.portal.md +++ b/.portal-docs/mar/README.aspire-dashboard.portal.md @@ -10,8 +10,8 @@ Watch [discussions](https://github.com/dotnet/dotnet-docker/discussions/categori ## Featured Tags -* `9.2` - * `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.2` +* `9.3` + * `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.3` ## Related Repositories diff --git a/README.aspire-dashboard.md b/README.aspire-dashboard.md index ad5feb3629..39e5e527d8 100644 --- a/README.aspire-dashboard.md +++ b/README.aspire-dashboard.md @@ -6,8 +6,8 @@ ## Featured Tags -* `9.2` - * `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.2` +* `9.3` + * `docker pull mcr.microsoft.com/dotnet/nightly/aspire-dashboard:9.3` ## About @@ -118,13 +118,13 @@ Limits are per-resource. For example, a `MaxLogCount` value of 10,000 configures Tags | Dockerfile | OS Version -----------| -------------| ------------- -9.2.0, 9.2, 9, latest | [Dockerfile](src/aspire-dashboard/9.2/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 +9.3.0, 9.3, 9, latest | [Dockerfile](src/aspire-dashboard/9.3/azurelinux-distroless/amd64/Dockerfile) | Azure Linux 3.0 ### Linux arm64 Tags Tags | Dockerfile | OS Version -----------| -------------| ------------- -9.2.0, 9.2, 9, latest | [Dockerfile](src/aspire-dashboard/9.2/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 +9.3.0, 9.3, 9, latest | [Dockerfile](src/aspire-dashboard/9.3/azurelinux-distroless/arm64v8/Dockerfile) | Azure Linux 3.0 *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md). See the [full list of tags](https://mcr.microsoft.com/v2/dotnet/nightly/aspire-dashboard/tags/list) for all supported and unsupported tags.* diff --git a/eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml b/eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml index 530ee7427b..dd85403c59 100644 --- a/eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml +++ b/eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml @@ -1,2 +1,2 @@ $(McrTagsYmlRepo:aspire-dashboard) -$(McrTagsYmlTagGroup:9.2) +$(McrTagsYmlTagGroup:9.3) diff --git a/eng/readme-templates/FeaturedTags.md b/eng/readme-templates/FeaturedTags.md index 1d1f9014b4..9ae89c79d6 100644 --- a/eng/readme-templates/FeaturedTags.md +++ b/eng/readme-templates/FeaturedTags.md @@ -18,8 +18,8 @@ elif match(REPO, "monitor/base"):* `9` (Standard Support) * `docker pull {{FULL_REPO}}:9` * `8` (Long-Term Support) * `docker pull {{FULL_REPO}}:8`^ -elif match(REPO, "aspire-dashboard"):* `9.2` - * `docker pull {{FULL_REPO}}:9.2`^ +elif match(REPO, "aspire-dashboard"):* `9.3` + * `docker pull {{FULL_REPO}}:9.3`^ elif match(REPO, "yarp"):* `2.3-preview` * `docker pull {{FULL_REPO}}:2.3-preview`^ else:{{if VARIABLES["branch"] = "nightly":* `10.0-preview` (Preview) diff --git a/manifest.json b/manifest.json index 386a8a8994..9e2695223b 100644 --- a/manifest.json +++ b/manifest.json @@ -9378,10 +9378,10 @@ "mcrTagsMetadataTemplate": "eng/mcr-tags-metadata-templates/aspire-dashboard-tags.yml", "images": [ { - "productVersion": "$(aspire-dashboard|9.2|product-version)", + "productVersion": "$(aspire-dashboard|9.3|product-version)", "sharedTags": { - "$(aspire-dashboard|9.2|fixed-tag)": {}, - "$(aspire-dashboard|9.2|minor-tag)": {}, + "$(aspire-dashboard|9.3|fixed-tag)": {}, + "$(aspire-dashboard|9.3|minor-tag)": {}, "$(aspire-dashboard|9|major-tag)": {}, "latest": {} }, @@ -9390,15 +9390,15 @@ "buildArgs": { "REPO": "$(Repo:aspnet)" }, - "dockerfile": "src/aspire-dashboard/9.2/azurelinux-distroless/amd64", + "dockerfile": "src/aspire-dashboard/9.3/azurelinux-distroless/amd64", "dockerfileTemplate": "eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux", "os": "linux", "osVersion": "azurelinux3.0-distroless", "tags": { - "$(aspire-dashboard|9.2|fixed-tag)-amd64": { + "$(aspire-dashboard|9.3|fixed-tag)-amd64": { "docType": "Undocumented" }, - "$(aspire-dashboard|9.2|minor-tag)-amd64": { + "$(aspire-dashboard|9.3|minor-tag)-amd64": { "docType": "Undocumented" }, "$(aspire-dashboard|9|major-tag)-amd64": { @@ -9411,15 +9411,15 @@ "buildArgs": { "REPO": "$(Repo:aspnet)" }, - "dockerfile": "src/aspire-dashboard/9.2/azurelinux-distroless/arm64v8", + "dockerfile": "src/aspire-dashboard/9.3/azurelinux-distroless/arm64v8", "dockerfileTemplate": "eng/dockerfile-templates/aspire-dashboard/Dockerfile.linux", "os": "linux", "osVersion": "azurelinux3.0-distroless", "tags": { - "$(aspire-dashboard|9.2|fixed-tag)-arm64v8": { + "$(aspire-dashboard|9.3|fixed-tag)-arm64v8": { "docType": "Undocumented" }, - "$(aspire-dashboard|9.2|minor-tag)-arm64v8": { + "$(aspire-dashboard|9.3|minor-tag)-arm64v8": { "docType": "Undocumented" }, "$(aspire-dashboard|9|major-tag)-arm64v8": { diff --git a/manifest.versions.json b/manifest.versions.json index f87b1b6552..53cb18138c 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -10,15 +10,15 @@ "alpine|9.0|floating-tag-version": "$(alpine|floating-tag-version)", "alpine|8.0|floating-tag-version": "$(alpine|floating-tag-version)", - "aspire-dashboard|9.2|build-version": "9.2.0-preview.1.25209.2", - "aspire-dashboard|9.2|product-version": "9.2.0", - "aspire-dashboard|9.2|fixed-tag": "$(aspire-dashboard|9.2|product-version)", - "aspire-dashboard|9.2|minor-tag": "9.2", + "aspire-dashboard|9.3|build-version": "9.3.0-preview.1.25265.20", + "aspire-dashboard|9.3|product-version": "9.3.0", + "aspire-dashboard|9.3|fixed-tag": "$(aspire-dashboard|9.3|product-version)", + "aspire-dashboard|9.3|minor-tag": "9.3", "aspire-dashboard|9|major-tag": "9", - "aspire-dashboard|9.2|linux|x64|sha": "e65595b852cdb6f48e98088776891969fd1d5a411ab1a693618cf71ad4d6d600dbf627466141a932f8de7c24ab3e414353ab8870b826b0680b676ea22d1671cb", - "aspire-dashboard|9.2|linux|arm64|sha": "61760dfb33302b4886d8132d94b04df762e18db4bdb4097024328430f25595dcffd696df91ace2924bbf49561fa28bba1dc83e508b172e09eb76165b0227d5b2", - "aspire-dashboard|9.2|base-url|main": "$(base-url|public|preview|nightly)", - "aspire-dashboard|9.2|base-url|nightly": "$(base-url|public|preview|nightly)", + "aspire-dashboard|9.3|linux|x64|sha": "d0bdcfb0ac5697b07a49eff93e53c55cab3a50fd547b3ad4d9ac863f943327fa86d266c00ca23214e8811fa89f18f9b6be28411d1e504861a269ec2d592be037", + "aspire-dashboard|9.3|linux|arm64|sha": "30f865ca6b004c5f2ce2a43bf1c079d08a6200ef0f5d4969811abf335dd3a0509d4c258fb1edf97c3ed9f39419f8c8ee610eccf8d5adad60f641b0d220741bcb", + "aspire-dashboard|9.3|base-url|main": "$(base-url|public|preview|nightly)", + "aspire-dashboard|9.3|base-url|nightly": "$(base-url|public|preview|nightly)", "aspnet|8.0|build-version": "8.0.16", "aspnet|8.0|linux-musl|x64|sha": "2f8569e1335bd25a1c93be52364dd1386c60d70c5f905ca830093125de20bfd99be0808cf98f6aafd6a0bf0867962d7436a54ea7b8eb42a6fb31eeb5b08e39a2", diff --git a/src/aspire-dashboard/9.2/azurelinux-distroless/amd64/Dockerfile b/src/aspire-dashboard/9.3/azurelinux-distroless/amd64/Dockerfile similarity index 82% rename from src/aspire-dashboard/9.2/azurelinux-distroless/amd64/Dockerfile rename to src/aspire-dashboard/9.3/azurelinux-distroless/amd64/Dockerfile index 8f4ff3aa70..955a2eb5c6 100644 --- a/src/aspire-dashboard/9.2/azurelinux-distroless/amd64/Dockerfile +++ b/src/aspire-dashboard/9.3/azurelinux-distroless/amd64/Dockerfile @@ -9,9 +9,9 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve Aspire Dashboard -RUN dotnet_aspire_version=9.2.0-preview.1.25209.2 \ +RUN dotnet_aspire_version=9.3.0-preview.1.25265.20 \ && curl -fSL --output aspire_dashboard.zip https://ci.dot.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-x64.zip \ - && aspire_dashboard_sha512='e65595b852cdb6f48e98088776891969fd1d5a411ab1a693618cf71ad4d6d600dbf627466141a932f8de7c24ab3e414353ab8870b826b0680b676ea22d1671cb' \ + && aspire_dashboard_sha512='d0bdcfb0ac5697b07a49eff93e53c55cab3a50fd547b3ad4d9ac863f943327fa86d266c00ca23214e8811fa89f18f9b6be28411d1e504861a269ec2d592be037' \ && echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \ && mkdir -p /app \ && unzip aspire_dashboard.zip -d /app \ diff --git a/src/aspire-dashboard/9.2/azurelinux-distroless/arm64v8/Dockerfile b/src/aspire-dashboard/9.3/azurelinux-distroless/arm64v8/Dockerfile similarity index 82% rename from src/aspire-dashboard/9.2/azurelinux-distroless/arm64v8/Dockerfile rename to src/aspire-dashboard/9.3/azurelinux-distroless/arm64v8/Dockerfile index 8ad12515ea..88d1e8cc61 100644 --- a/src/aspire-dashboard/9.2/azurelinux-distroless/arm64v8/Dockerfile +++ b/src/aspire-dashboard/9.3/azurelinux-distroless/arm64v8/Dockerfile @@ -9,9 +9,9 @@ RUN tdnf install -y \ && tdnf clean all # Retrieve Aspire Dashboard -RUN dotnet_aspire_version=9.2.0-preview.1.25209.2 \ +RUN dotnet_aspire_version=9.3.0-preview.1.25265.20 \ && curl -fSL --output aspire_dashboard.zip https://ci.dot.net/public/aspire/$dotnet_aspire_version/aspire-dashboard-linux-arm64.zip \ - && aspire_dashboard_sha512='61760dfb33302b4886d8132d94b04df762e18db4bdb4097024328430f25595dcffd696df91ace2924bbf49561fa28bba1dc83e508b172e09eb76165b0227d5b2' \ + && aspire_dashboard_sha512='30f865ca6b004c5f2ce2a43bf1c079d08a6200ef0f5d4969811abf335dd3a0509d4c258fb1edf97c3ed9f39419f8c8ee610eccf8d5adad60f641b0d220741bcb' \ && echo "$aspire_dashboard_sha512 aspire_dashboard.zip" | sha512sum -c - \ && mkdir -p /app \ && unzip aspire_dashboard.zip -d /app \ diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspire-dashboard-9.2-azurelinux-distroless-amd64-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspire-dashboard-9.3-azurelinux-distroless-amd64-Dockerfile.approved.txt similarity index 100% rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspire-dashboard-9.2-azurelinux-distroless-amd64-Dockerfile.approved.txt rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspire-dashboard-9.3-azurelinux-distroless-amd64-Dockerfile.approved.txt diff --git a/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspire-dashboard-9.2-azurelinux-distroless-arm64v8-Dockerfile.approved.txt b/tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspire-dashboard-9.3-azurelinux-distroless-arm64v8-Dockerfile.approved.txt similarity index 100% rename from tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspire-dashboard-9.2-azurelinux-distroless-arm64v8-Dockerfile.approved.txt rename to tests/Microsoft.DotNet.Docker.Tests/Baselines/GeneratedArtifactTests/VerifyInternalDockerfilesOutput/aspire-dashboard-9.3-azurelinux-distroless-arm64v8-Dockerfile.approved.txt diff --git a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs index 3a9c2457fd..7304aa8e7d 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs @@ -15,7 +15,7 @@ public readonly record struct ImageVersion public static readonly ImageVersion V9_0 = new(new Version(9, 0), isPreview: false); public static readonly ImageVersion V9_1 = new(new Version(9, 1), isPreview: false); public static readonly ImageVersion V9_1_Preview = new(new Version(9, 1), isPreview: true); - public static readonly ImageVersion V9_2 = new(new Version(9, 2), isPreview: false); + public static readonly ImageVersion V9_3 = new(new Version(9, 3), isPreview: false); public static readonly ImageVersion V9_2_Preview = new(new Version(9, 2), isPreview: true); public static readonly ImageVersion V10_0_Preview = new(new Version(10, 0), isPreview: true); diff --git a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs index 767e563c8a..4730076350 100644 --- a/tests/Microsoft.DotNet.Docker.Tests/TestData.cs +++ b/tests/Microsoft.DotNet.Docker.Tests/TestData.cs @@ -337,7 +337,7 @@ public static class TestData private static readonly ProductImageData[] s_AspireDashboardTestData = { new() { - Version = V9_2, + Version = V9_3, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSTag = "", @@ -346,7 +346,7 @@ public static class TestData SupportedImageRepos = DotNetImageRepo.Aspire_Dashboard, }, new() { - Version = V9_2, + Version = V9_3, VersionFamily = V9_0, OS = OS.AzureLinux30Distroless, OSTag = "",