Merge branch 'nightly' into net11

Author: lbussell

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.1.0, 13.1, 13, latest | [Dockerfile](src/aspire-dashboard/amd64/Dockerfile) | Azure Linux 3.0
+13.2.0, 13.2, 13, latest | [Dockerfile](src/aspire-dashboard/amd64/Dockerfile) | Azure Linux 3.0
 
 ### Linux arm64 Tags
 
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-13.1.0, 13.1, 13, latest | [Dockerfile](src/aspire-dashboard/arm64v8/Dockerfile) | Azure Linux 3.0
+13.2.0, 13.2, 13, latest | [Dockerfile](src/aspire-dashboard/arm64v8/Dockerfile) | Azure Linux 3.0
 <!--End of generated tags-->
 
 *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.*

manifest.versions.json

@@ -18,13 +18,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.1.0-preview.1.25604.1",
-    "aspire-dashboard|product-version": "13.1.0",
-    "aspire-dashboard|fixed-tag": "13.1.0",
-    "aspire-dashboard|minor-tag": "13.1",
+    "aspire-dashboard|build-version": "13.2.0-preview.1.25611.1",
+    "aspire-dashboard|product-version": "13.2.0",
+    "aspire-dashboard|fixed-tag": "13.2.0",
+    "aspire-dashboard|minor-tag": "13.2",
     "aspire-dashboard|major-tag": "13",
-    "aspire-dashboard|linux|x64|sha": "687f04d2d1ee90cc504eef699c6b9c0a784d89216dab2ec4b5ff1bd5656bfa0e64155c76058437628c04c766c3896597ca5f1c97ef520ba0f97863d0f3c1f2b4",
-    "aspire-dashboard|linux|arm64|sha": "d787e4cc094cee3ddc2af79d6ab8c5174b548e48c8eed866ec2edd152396256aff1f9996e780d919f2fbc1fb8af08712eb23479542053f29a0f7fcbd2a7bc706",
+    "aspire-dashboard|linux|x64|sha": "920913285307f6ad5146da38449251859601c2c0ed4ec5251c1dd9a971edf5cf2021aaa6112f4b92e259267972d2695a300d6d8fa7d432f664847fdc0adc5647",
+    "aspire-dashboard|linux|arm64|sha": "e8ef0cfa6d6c60d3bcde80f8f50b87f4c8fcda88a7b6762f5780d0ff8f23d140ac88a1a87888bdda7040466fae3e96ca53ace7fb5d3a47282f778d7f24764b7e",
     "aspire-dashboard|base-url|main": "$(base-url|public|preview|nightly)",
     "aspire-dashboard|base-url|nightly": "$(base-url|public|preview|nightly)",
 

src/aspire-dashboard/amd64/Dockerfile

@@ -9,9 +9,9 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve Aspire Dashboard
-RUN dotnet_aspire_version=13.1.0-preview.1.25604.1 \
+RUN dotnet_aspire_version=13.2.0-preview.1.25611.1 \
     && 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='687f04d2d1ee90cc504eef699c6b9c0a784d89216dab2ec4b5ff1bd5656bfa0e64155c76058437628c04c766c3896597ca5f1c97ef520ba0f97863d0f3c1f2b4' \
+    && aspire_dashboard_sha512='920913285307f6ad5146da38449251859601c2c0ed4ec5251c1dd9a971edf5cf2021aaa6112f4b92e259267972d2695a300d6d8fa7d432f664847fdc0adc5647' \
     && echo "$aspire_dashboard_sha512  aspire_dashboard.zip" | sha512sum -c - \
     && mkdir --parents /app \
     && unzip aspire_dashboard.zip -d /app \

src/aspire-dashboard/arm64v8/Dockerfile

@@ -9,9 +9,9 @@ RUN tdnf install -y \
     && tdnf clean all
 
 # Retrieve Aspire Dashboard
-RUN dotnet_aspire_version=13.1.0-preview.1.25604.1 \
+RUN dotnet_aspire_version=13.2.0-preview.1.25611.1 \
     && 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='d787e4cc094cee3ddc2af79d6ab8c5174b548e48c8eed866ec2edd152396256aff1f9996e780d919f2fbc1fb8af08712eb23479542053f29a0f7fcbd2a7bc706' \
+    && aspire_dashboard_sha512='e8ef0cfa6d6c60d3bcde80f8f50b87f4c8fcda88a7b6762f5780d0ff8f23d140ac88a1a87888bdda7040466fae3e96ca53ace7fb5d3a47282f778d7f24764b7e' \
     && echo "$aspire_dashboard_sha512  aspire_dashboard.zip" | sha512sum -c - \
     && mkdir --parents /app \
     && unzip aspire_dashboard.zip -d /app \

tests/Microsoft.DotNet.Docker.Tests/ImageVersion.cs

@@ -14,7 +14,7 @@ public readonly record struct ImageVersion
         public static readonly ImageVersion V8_1 = new(new Version(8, 1), isPreview: false);
         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 V13_1 = new(new Version(13, 1), isPreview: false);
+        public static readonly ImageVersion V13_2 = new(new Version(13, 2), 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);

tests/Microsoft.DotNet.Docker.Tests/TestData.cs

@@ -465,7 +465,7 @@ public static class TestData
         private static readonly ProductImageData[] s_AspireDashboardTestData =
         {
             new() {
-                Version = V13_1,
+                Version = V13_2,
                 VersionFamily = V9_0,
                 OS = OS.AzureLinux30Distroless,
                 OSTag = "",
@@ -474,7 +474,7 @@ public static class TestData
                 SupportedImageRepos = DotNetImageRepo.Aspire_Dashboard,
             },
             new() {
-                Version = V13_1,
+                Version = V13_2,
                 VersionFamily = V9_0,
                 OS = OS.AzureLinux30Distroless,
                 OSTag = "",