Skip to content

Add support for Windows 2025 containers #3911

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.

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

Merged
merged 1 commit into from
Apr 25, 2025
Merged
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion ContainerHandling/Get-BestGenericImageName.ps1
Original file line number Diff line number Diff line change
@@ -40,10 +40,14 @@ try {
# Everything before Windows Server 2022 uses ltsc2019
$ltscVersion = 'ltsc2019'
}
else {
elseif ("$hostOsVersion" -lt [System.Version]"10.0.26100.0") {
# Default is ltsc2022
$ltscVersion = 'ltsc2022'
}
else {
# Default is ltsc2025
$ltscVersion = 'ltsc2025'
}

if ($filesOnly) {
$genericImageNameSetting = $bcContainerHelperConfig.genericImageNameFilesOnly.Replace('{1}', $ltscVersion)
7 changes: 6 additions & 1 deletion ContainerHandling/New-NavImage.ps1
Original file line number Diff line number Diff line change
@@ -139,7 +139,12 @@ try {
}

if ($os.BuildNumber -eq 26100) {
$hostOs = "24H2"
if ($isServerHost) {
$hostOs = "ltsc2025"
}
else {
$hostOs = "24H2"
}
}
elseif ($os.BuildNumber -eq 22631) {
$hostOs = "23H2"
10 changes: 9 additions & 1 deletion HelperFunctions.ps1
Original file line number Diff line number Diff line change
@@ -1602,6 +1602,9 @@ function GetContainerOs {
elseif ("$containerOsVersion".StartsWith('10.0.20348.')) {
$containerOs = "ltsc2022"
}
elseif ("$containerOsVersion".StartsWith('10.0.26100.')) {
$containerOs = "ltsc2025"
}
else {
$containerOs = "unknown"
}
@@ -1618,7 +1621,12 @@ function GetHostOs {

$hostOs = "Unknown/Insider build"
if ($os.BuildNumber -eq 26100) {
$hostOs = "24H2"
if ($isServerHost) {
$hostOs = "ltsc2025"
}
else {
$hostOs = "24H2"
}
}
elseif ($os.BuildNumber -eq 22631) {
$hostOs = "23H2"
1 change: 1 addition & 0 deletions ReleaseNotes.txt
Original file line number Diff line number Diff line change
@@ -9,6 +9,7 @@ Fixes issues determining test symbols for W1 and OnPrem artifacts not containing
Add cache for search results of a NuGet feed
Add new setting NuGetSearchResultsCacheRetentionPeriod (default: 600) to set the retention period (in seconds) for the search result cache of NuGet feeds (0 to disable the cache)
Download-BcNuGetPackageToFolder checks all direct dependency versions of a package based on the NuSpec before downloading the whole package and its dependencies
Add support for Windows 2025 Containers

6.1.3
Add setting ExcludeBuilds, which is an array of NuGet range specifications to exclude from Get-BcArtifactUrl. See more about range specification here: https://learn.microsoft.com/en-us/nuget/concepts/package-versioning?tabs=semver20sort#version-ranges