From 583cb799ad6b477611ef8e8c06ef5ec50d15142c Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Wed, 10 Dec 2025 11:04:01 -0800 Subject: [PATCH 1/2] Only verify VS 18 major version in tests --- manifest.versions.json | 2 +- .../SdkOnlyImageTests.cs | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/manifest.versions.json b/manifest.versions.json index f0a1c958..c4a992a3 100644 --- a/manifest.versions.json +++ b/manifest.versions.json @@ -13,7 +13,7 @@ "referenceassemblies|version": "1.0.3", "servicemonitor|version": "2.0.1.10", "servicemonitor|url": "https://github.com/microsoft/IIS.ServiceMonitor/releases/download/v$(servicemonitor|version)/ServiceMonitor.exe", - "vs|version": "18.0", + "vs|version": "18", "vs|buildToolsUrl": "https://aka.ms/vs/stable/vs_BuildTools.exe", "vs|ltsc2016|version": "17.14", "vs|ltsc2016|testAgentUrl": "https://aka.ms/vs/17/release/vs_TestAgent.exe", diff --git a/tests/Microsoft.DotNet.Framework.Docker.Tests/SdkOnlyImageTests.cs b/tests/Microsoft.DotNet.Framework.Docker.Tests/SdkOnlyImageTests.cs index 2258f6ad..4070c68b 100644 --- a/tests/Microsoft.DotNet.Framework.Docker.Tests/SdkOnlyImageTests.cs +++ b/tests/Microsoft.DotNet.Framework.Docker.Tests/SdkOnlyImageTests.cs @@ -114,8 +114,14 @@ public void VerifyVsWhereOperability(ImageDescriptor imageDescriptor) Version actualVsVersion = Version.Parse(json[0]["catalog"]["buildVersion"].ToString()); Version expectedVsVersion = imageDescriptor.GetExpectedVsVersion(); + // For VS 18 and later, only verify the major version since new minor versions release monthly. + // See https://learn.microsoft.com/visualstudio/releases/2026/release-notes#december-update-1810 Assert.Equal(expectedVsVersion.Major, actualVsVersion.Major); - Assert.Equal(expectedVsVersion.Minor, actualVsVersion.Minor); + // For VS versions < 18, continue to verify the minor version. + if (expectedVsVersion.Major < 18 || actualVsVersion.Major < 18) + { + Assert.Equal(expectedVsVersion.Minor, actualVsVersion.Minor); + } } [SkippableTheory] From 2dbae3cccec9e5154456a52e85fb22220d92fcc7 Mon Sep 17 00:00:00 2001 From: Logan Bussell Date: Thu, 8 Jan 2026 11:02:39 -0800 Subject: [PATCH 2/2] Fix version parsing to append ".0" for single number versions --- .../ImageDescriptorExtensions.cs | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/tests/Microsoft.DotNet.Framework.Docker.Tests/ImageDescriptorExtensions.cs b/tests/Microsoft.DotNet.Framework.Docker.Tests/ImageDescriptorExtensions.cs index 875c9142..fb9102fd 100644 --- a/tests/Microsoft.DotNet.Framework.Docker.Tests/ImageDescriptorExtensions.cs +++ b/tests/Microsoft.DotNet.Framework.Docker.Tests/ImageDescriptorExtensions.cs @@ -30,7 +30,16 @@ public static Version GetExpectedVsVersion(this ImageDescriptor imageDescriptor) _ => "vs|version", }; - return Version.Parse((string)manifestVariables[vsVersionVariable]); + string versionString = (string)manifestVariables[vsVersionVariable]; + + // Version.Parse requires at least major.minor format. + // If the version string is just a single number, append ".0". + if (!versionString.Contains('.')) + { + versionString += ".0"; + } + + return Version.Parse(versionString); } ///