Add all known unreleased Debian version codenames

eng/tests/pipeline-validation/1.0/noble/amd64/Dockerfile

@@ -0,0 +1 @@
+FROM ubuntu.azurecr.io/ubuntu:noble

eng/tests/pipeline-validation/1.0/noble/arm64v8/Dockerfile

@@ -0,0 +1 @@
+FROM ubuntu.azurecr.io/ubuntu:noble

eng/tests/pipeline-validation/README.placeholder.md

@@ -7,12 +7,12 @@ A placeholder file for testing purposes. The image tags and URLs referenced here
 ## Linux amd64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker-test/blob/main/test/pipeline-validation/1.0/focal/amd64/Dockerfile) | Ubuntu 20.04
+noble | [Dockerfile](https://github.com/dotnet/dotnet-docker-test/blob/main/test/pipeline-validation/1.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 
 ## Linux arm64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-focal-arm64 | [Dockerfile](https://github.com/dotnet/dotnet-docker-test/blob/main/test/pipeline-validation/1.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04
+noble-arm64 | [Dockerfile](https://github.com/dotnet/dotnet-docker-test/blob/main/test/pipeline-validation/1.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 
 ## Windows Server 2019 amd64 Tags
 Tag | Dockerfile

eng/tests/pipeline-validation/templates/README.md

@@ -7,12 +7,12 @@ A placeholder file for testing purposes. The image tags and URLs referenced here
 ## Linux amd64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-focal | [Dockerfile](https://github.com/dotnet/dotnet-docker-test/blob/main/test/pipeline-validation/1.0/focal/amd64/Dockerfile) | Ubuntu 20.04
+noble | [Dockerfile](https://github.com/dotnet/dotnet-docker-test/blob/main/test/pipeline-validation/1.0/noble/amd64/Dockerfile) | Ubuntu 24.04
 
 ## Linux arm64 Tags
 Tags | Dockerfile | OS Version
 -----------| -------------| -------------
-focal-arm64 | [Dockerfile](https://github.com/dotnet/dotnet-docker-test/blob/main/test/pipeline-validation/1.0/focal/arm64v8/Dockerfile) | Ubuntu 20.04
+noble-arm64 | [Dockerfile](https://github.com/dotnet/dotnet-docker-test/blob/main/test/pipeline-validation/1.0/noble/arm64v8/Dockerfile) | Ubuntu 24.04
 
 ## Windows Server 2019 amd64 Tags
 Tag | Dockerfile

eng/tests/pipeline-validation/templates/test-tags.yml

@@ -1,4 +1,4 @@
 $(McrTagsYmlRepo:test)
-$(McrTagsYmlTagGroup:focal)
-$(McrTagsYmlTagGroup:focal-arm64)
+$(McrTagsYmlTagGroup:noble)
+$(McrTagsYmlTagGroup:noble-arm64)
 $(McrTagsYmlTagGroup:nanoserver-1809)

eng/tests/pipeline-validation/test-manifest.json

@@ -11,20 +11,20 @@
         {
           "platforms": [
             {
-              "dockerfile": "1.0/focal/amd64",
+              "dockerfile": "1.0/noble/amd64",
               "os": "linux",
-              "osVersion": "focal",
+              "osVersion": "noble",
               "tags": {
-                "focal": {}
+                "noble": {}
               }
             },
             {
               "architecture": "arm64",
-              "dockerfile": "1.0/focal/arm64v8",
+              "dockerfile": "1.0/noble/arm64v8",
               "os": "linux",
-              "osVersion": "focal",
+              "osVersion": "noble",
               "tags": {
-                "focal-arm64": {}
+                "noble-arm64": {}
               },
               "variant": "v8"
             },

src/Microsoft.DotNet.ImageBuilder/src/Models/Manifest/CustomBuildLegDependencyType.cs

@@ -25,7 +25,7 @@ public enum CustomBuildLegDependencyType
             "This means the dependent image will have its own dependency graph considered for build leg " +
             "generation. An example of this is when a custom build leg dependency is defined to " +
             "include an SDK image supported on a particular architecture in order to test a runtime OS " +
-            "that doesn't its own SDK on that architecture (Buster ARM SDK to test Alpine ARM runtime); " +
+            "that doesn't its own SDK on that architecture (Trixie ARM SDK to test Alpine ARM runtime); " +
             "in that case, the SDK will be included in a leg together with the runtime and the SDK will " +
             "still have have its own leg."
             )]

src/Microsoft.DotNet.ImageBuilder/src/ViewModel/PlatformInfo.cs

@@ -156,126 +156,57 @@ public bool IsInternalFromImage(string fromImage)
             return _internalRepos.Any(repo => fromImage.StartsWith($"{repo}:"));
         }
 
-        public string GetOSDisplayName()
+        public string GetOSDisplayName() => Model.OS switch
         {
-            string displayName;
-            string os = BaseOsVersion;
+            OS.Windows => GetWindowsOSDisplayName(BaseOsVersion),
+            _ => GetLinuxOSDisplayName(BaseOsVersion)
+        };
 
-            if (Model.OS == OS.Windows)
-            {
-                string version = os.Split('-')[1];
-                if (os.StartsWith("nanoserver"))
-                {
-                    displayName = GetWindowsVersionDisplayName("Nano Server", version);
-                }
-                else if (os.StartsWith("windowsservercore"))
-                {
-                    displayName = GetWindowsVersionDisplayName("Windows Server Core", version);
-                }
-                else
-                {
-                    throw new NotSupportedException($"The OS version '{os}' is not supported.");
-                }
-            }
-            else
+        private static string GetWindowsOSDisplayName(string os)
+        {
+            string version = os.Split('-')[1];
+            return os switch
             {
-                if (os.Contains("debian"))
-                {
-                    displayName = "Debian";
-                }
-                else if (os.Contains("jessie"))
-                {
-                    displayName = "Debian 8";
-                }
-                else if (os.Contains("stretch"))
-                {
-                    displayName = "Debian 9";
-                }
-                else if (os.Contains("buster"))
-                {
-                    displayName = "Debian 10";
-                }
-                else if (os.Contains("bullseye"))
-                {
-                    displayName = "Debian 11";
-                }
-                else if (os.Contains("bookworm"))
-                {
-                    displayName = "Debian 12";
-                }
-                else if (os.Contains("xenial"))
-                {
-                    displayName = "Ubuntu 16.04";
-                }
-                else if (os.Contains("bionic"))
-                {
-                    displayName = "Ubuntu 18.04";
-                }
-                else if (os.Contains("disco"))
-                {
-                    displayName = "Ubuntu 19.04";
-                }
-                else if (os.Contains("focal"))
-                {
-                    displayName = "Ubuntu 20.04";
-                }
-                else if (os.Contains("hirsute"))
-                {
-                    displayName = "Ubuntu 21.04";
-                }
-                else if (os.Contains("impish"))
-                {
-                    displayName = "Ubuntu 21.10";
-                }
-                else if (os.Contains("jammy"))
-                {
-                    displayName = "Ubuntu 22.04";
-                }
-                else if (os.Contains("noble"))
-                {
-                    displayName = "Ubuntu 24.04";
-                }
-                else if (os.Contains("alpine") || os.Contains("centos") || os.Contains("fedora"))
-                {
-                    displayName = FormatVersionableOsName(os, name => name.FirstCharToUpper());
-                }
-                else if (os.Contains("azurelinux"))
-                {
-                    displayName = FormatVersionableOsName(os, name => "Azure Linux");
-                }
-                else if (os.Contains("cbl-mariner"))
-                {
-                    displayName = FormatVersionableOsName(os, name => "CBL-Mariner");
-                }
-                else if (os.Contains("leap"))
-                {
-                    displayName = FormatVersionableOsName(os, name => "openSUSE Leap");
-                }
-                else if (os.Contains("ubuntu"))
-                {
-                    displayName = FormatVersionableOsName(os, name => "Ubuntu");
-                }
-                else
-                {
-                    throw new NotSupportedException($"The OS version '{os}' is not supported.");
-                }
-            }
-
-            return displayName;
+                var s when s.StartsWith("nanoserver") => GetWindowsVersionDisplayName("Nano Server", version),
+                var s when s.StartsWith("windowsservercore") => GetWindowsVersionDisplayName("Windows Server Core", version),
+                _ => throw new NotSupportedException($"The OS version '{os}' is not supported.")
+            };
         }
 
-        private static string GetWindowsVersionDisplayName(string windowsName, string version)
+        private static string GetLinuxOSDisplayName(string os)
         {
-            if (version.StartsWith("ltsc"))
-            {
-                return $"{windowsName} {version.TrimStartString("ltsc")}";
-            }
-            else
+            return os switch
             {
-                return $"{windowsName}, version {version}";
-            }
+                string s when s.Contains("debian") => "Debian",
+                string s when s.Contains("bookworm") => "Debian 12",
+                string s when s.Contains("trixie") => "Debian 13",
+                string s when s.Contains("forky") => "Debian 14",
+                string s when s.Contains("duke") => "Debian 15",
+                string s when s.Contains("jammy") => "Ubuntu 22.04",
+                string s when s.Contains("noble") => "Ubuntu 24.04",
+                string s when s.Contains("azurelinux") =>
+                    FormatVersionableOsName(os, name => "Azure Linux"),
+                string s when s.Contains("cbl-mariner") =>
+                    FormatVersionableOsName(os, name => "CBL-Mariner"),
+                string s when s.Contains("leap") =>
+                    FormatVersionableOsName(os, name => "openSUSE Leap"),
+                string s when s.Contains("ubuntu") =>
+                    FormatVersionableOsName(os, name => "Ubuntu"),
+                string s when s.Contains("alpine")
+                    || s.Contains("centos")
+                    || s.Contains("fedora") =>
+                        FormatVersionableOsName(os, name => name.FirstCharToUpper()),
+                _ => throw new NotSupportedException($"The OS version '{os}' is not supported.")
+            };
         }
 
+        private static string GetWindowsVersionDisplayName(string windowsName, string version) =>
+            version.StartsWith("ltsc") switch
+            {
+                true => $"{windowsName} {version.TrimStartString("ltsc")}",
+                false => $"{windowsName}, version {version}"
+            };
+
         public static bool AreMatchingPlatforms(ImageInfo image1, PlatformInfo platform1, ImageInfo image2, PlatformInfo platform2) =>
             platform1.GetUniqueKey(image1) == platform2.GetUniqueKey(image2);