Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add all known unreleased Debian version codenames #1570

Merged
merged 6 commits into from
Jan 28, 2025
+154 −230
Merged

Add all known unreleased Debian version codenames #1570

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b9687e
Use switch expressions to calculate OS display name
lbussell Jan 28, 2025
68016c8
Add all known unreleased Debian version codenames
lbussell Jan 28, 2025
c6d3157
Add sid
lbussell Jan 28, 2025
dccfd46
Remove versions we don't plan to ship
lbussell Jan 28, 2025
c4b8a4f
Replace old OS versions in tests
lbussell Jan 28, 2025
3b568bf
Move Dockerfiles
lbussell Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Use switch expressions to calculate OS display name
@lbussell
lbussell committed Jan 28, 2025
commit 7b9687e01cb1519081f77b570d9e091fe12808ed
160 changes: 49 additions & 111 deletions src/Microsoft.DotNet.ImageBuilder/src/ViewModel/PlatformInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -156,126 +156,64 @@ 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("jessie") => "Debian 8",
string s when s.Contains("stretch") => "Debian 9",
string s when s.Contains("buster") => "Debian 10",
string s when s.Contains("bullseye") => "Debian 11",
string s when s.Contains("bookworm") => "Debian 12",
string s when s.Contains("xenial") => "Ubuntu 16.04",
string s when s.Contains("bionic") => "Ubuntu 18.04",
string s when s.Contains("disco") => "Ubuntu 19.04",
string s when s.Contains("focal") => "Ubuntu 20.04",
string s when s.Contains("hirsute") => "Ubuntu 21.04",
string s when s.Contains("impish") => "Ubuntu 21.10",
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);