Remove old images from TestData

Author: lbussell

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

@@ -19,7 +19,7 @@ public AspnetImageTests(ITestOutputHelper outputHelper)
         protected override string ImageType => ImageTypes.Aspnet;
 
         public static IEnumerable<object[]> GetImageData() =>
-            ImageTestHelper.ApplyImageDataFilters(TestData.GetImageData(), ImageTypes.Aspnet);
+            ImageTestHelper.ApplyImageDataFilters(TestData.ImageData, ImageTypes.Aspnet);
 
         [Theory]
         [MemberData(nameof(GetImageData))]

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

@@ -19,7 +19,7 @@ public RuntimeOnlyImageTests(ITestOutputHelper outputHelper)
         protected override string ImageType => ImageTypes.Runtime;
 
         public static IEnumerable<object[]> GetImageData() =>
-            ImageTestHelper.ApplyImageDataFilters(TestData.GetImageData(), ImageTypes.Runtime);
+            ImageTestHelper.ApplyImageDataFilters(TestData.ImageData, ImageTypes.Runtime);
 
         [Theory]
         [MemberData(nameof(GetImageData))]

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

@@ -23,7 +23,7 @@ public RuntimeSdkImageTests(ITestOutputHelper outputHelper)
 
         public static IEnumerable<object[]> GetImageData()
         {
-            return ImageTestHelper.ApplyImageDataFilters(TestData.GetImageData(), ImageTypes.Runtime);
+            return ImageTestHelper.ApplyImageDataFilters(TestData.ImageData, ImageTypes.Runtime);
         }
 
         [Theory]

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

@@ -24,7 +24,7 @@ public SdkOnlyImageTests(ITestOutputHelper outputHelper)
         protected override string ImageType => "sdk";
 
         public static IEnumerable<object[]> GetImageData() =>
-            ImageTestHelper.ApplyImageDataFilters(TestData.GetImageData(), ImageTypes.Sdk, allowEmptyResults: true);
+            ImageTestHelper.ApplyImageDataFilters(TestData.ImageData, ImageTypes.Sdk, allowEmptyResults: true);
 
         private static bool IsSkippable(ImageDescriptor imageDescriptor) =>
             imageDescriptor is null ||

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

@@ -7,22 +7,11 @@ namespace Microsoft.DotNet.Framework.Docker.Tests;
 
 internal static class TestData
 {
-    private static readonly ImageDescriptor[] s_imageData = new ImageDescriptor[]
-        {
-            new ImageDescriptor { Version = "3.5", SdkVersion = "3.5", OsVariant = OsVersion.WSC_LTSC2016 },
-            new ImageDescriptor { Version = "3.5", SdkVersion = "3.5", OsVariant = OsVersion.WSC_LTSC2019 },
-            new ImageDescriptor { Version = "3.5", SdkVersion = "3.5", OsVariant = OsVersion.WSC_LTSC2022 },
-            new ImageDescriptor { Version = "4.6.2", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2016 },
-            new ImageDescriptor { Version = "4.7", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2016 },
-            new ImageDescriptor { Version = "4.7.1", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2016 },
-            new ImageDescriptor { Version = "4.7.2", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2016 },
-            new ImageDescriptor { Version = "4.7.2", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2019 },
-            new ImageDescriptor { Version = "4.8", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2016 },
-            new ImageDescriptor { Version = "4.8", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2019 },
-            new ImageDescriptor { Version = "4.8", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2022 },
-            new ImageDescriptor { Version = "4.8.1", SdkVersion = "4.8.1", OsVariant = OsVersion.WSC_LTSC2022 },
-            new ImageDescriptor { Version = "4.8.1", SdkVersion = "4.8.1", OsVariant = OsVersion.WSC_LTSC2025 },
-        };
-
-    public static IEnumerable<ImageDescriptor> GetImageData() => s_imageData;
+    public static IEnumerable<ImageDescriptor> ImageData =>
+    [
+        new() { Version = "4.8", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2016 },
+        new() { Version = "4.8", SdkVersion = "4.8", OsVariant = OsVersion.WSC_LTSC2019 },
+        new() { Version = "4.8.1", SdkVersion = "4.8.1", OsVariant = OsVersion.WSC_LTSC2022 },
+        new() { Version = "4.8.1", SdkVersion = "4.8.1", OsVariant = OsVersion.WSC_LTSC2025 },
+    ];
 }

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

@@ -19,7 +19,7 @@ public WcfImageTests(ITestOutputHelper outputHelper)
         protected override string ImageType => ImageTypes.Wcf;
 
         public static IEnumerable<object[]> GetImageData() =>
-            ImageTestHelper.ApplyImageDataFilters(TestData.GetImageData(), ImageTypes.Wcf, allowEmptyResults: true);
+            ImageTestHelper.ApplyImageDataFilters(TestData.ImageData, ImageTypes.Wcf, allowEmptyResults: true);
 
         private static bool IsSkippable(ImageDescriptor imageDescriptor) =>
             imageDescriptor is null || imageDescriptor.Version == "3.5";