Skip to content

Commit d090f63

Browse files
committed
Update test data
1 parent 80de66c commit d090f63

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

tests/Microsoft.DotNet.Framework.Docker.Tests/OsVersion.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ public static class OsVersion
99
public const string WSC_LTSC2016 = "windowsservercore-ltsc2016";
1010
public const string WSC_LTSC2019 = "windowsservercore-ltsc2019";
1111
public const string WSC_LTSC2022 = "windowsservercore-ltsc2022";
12+
public const string WSC_LTSC2025 = "windowsservercore-ltsc2025";
1213
}
1314
}

tests/Microsoft.DotNet.Framework.Docker.Tests/RuntimeSdkImageTests.cs

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,8 @@ public void VerifyImagesWithWebApps(ImageDescriptor imageDescriptor)
4444
[MemberData(nameof(GetImageData))]
4545
public void ContainerLimits(ImageDescriptor imageDescriptor)
4646
{
47-
// Container limits are only supported on 4.8 for Server 2019 and 2022.
48-
if (imageDescriptor.Version != "4.8" ||
49-
(imageDescriptor.OsVariant != OsVersion.WSC_LTSC2019 &&
50-
imageDescriptor.OsVariant != OsVersion.WSC_LTSC2022))
47+
// Container limits are only supported on 4.8 and Server 2019 and later
48+
if (imageDescriptor.Version != "4.8" || imageDescriptor.OsVariant == OsVersion.WSC_LTSC2016)
5149
{
5250
_imageTestHelper.OutputHelper.WriteLine("Test skipped due to unsupported version.");
5351
return;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ internal static class TestData
1212
new ImageDescriptor { Version = "3.5", SdkVersion = "3.5", OsVariant = OsVersion.WSC_LTSC2016 },
1313
new ImageDescriptor { Version = "3.5", SdkVersion = "3.5", OsVariant = OsVersion.WSC_LTSC2019 },
1414
new ImageDescriptor { Version = "3.5", SdkVersion = "3.5", OsVariant = OsVersion.WSC_LTSC2022 },
15+
new ImageDescriptor { Version = "3.5", SdkVersion = "3.5", OsVariant = OsVersion.WSC_LTSC2025 },
1516
new ImageDescriptor { Version = "4.6.2", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2016 },
1617
new ImageDescriptor { Version = "4.7", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2016 },
1718
new ImageDescriptor { Version = "4.7.1", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2016 },
@@ -21,6 +22,7 @@ internal static class TestData
2122
new ImageDescriptor { Version = "4.8", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2019 },
2223
new ImageDescriptor { Version = "4.8", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2022 },
2324
new ImageDescriptor { Version = "4.8.1", SdkVersion = "4.8.1", OsVariant = OsVersion.WSC_LTSC2022 },
25+
new ImageDescriptor { Version = "4.8.1", SdkVersion = "4.8.1", OsVariant = OsVersion.WSC_LTSC2025 },
2426
};
2527

2628
public static IEnumerable<ImageDescriptor> GetImageData() => s_imageData;

0 commit comments

Comments
 (0)