Skip to content

Commit be11211

Browse files
authored
Only verify VS 18 major version in tests (#1281)
1 parent f5789ab commit be11211

3 files changed

Lines changed: 18 additions & 3 deletions

File tree

manifest.versions.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
"referenceassemblies|version": "1.0.3",
1414
"servicemonitor|version": "2.0.1.10",
1515
"servicemonitor|url": "https://github.com/microsoft/IIS.ServiceMonitor/releases/download/v$(servicemonitor|version)/ServiceMonitor.exe",
16-
"vs|version": "18.0",
16+
"vs|version": "18",
1717
"vs|buildToolsUrl": "https://aka.ms/vs/stable/vs_BuildTools.exe",
1818
"vs|ltsc2016|version": "17.14",
1919
"vs|ltsc2016|testAgentUrl": "https://aka.ms/vs/17/release/vs_TestAgent.exe",

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,16 @@ public static Version GetExpectedVsVersion(this ImageDescriptor imageDescriptor)
3030
_ => "vs|version",
3131
};
3232

33-
return Version.Parse((string)manifestVariables[vsVersionVariable]);
33+
string versionString = (string)manifestVariables[vsVersionVariable];
34+
35+
// Version.Parse requires at least major.minor format.
36+
// If the version string is just a single number, append ".0".
37+
if (!versionString.Contains('.'))
38+
{
39+
versionString += ".0";
40+
}
41+
42+
return Version.Parse(versionString);
3443
}
3544

3645
/// <summary>

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,14 @@ public void VerifyVsWhereOperability(ImageDescriptor imageDescriptor)
114114
Version actualVsVersion = Version.Parse(json[0]["catalog"]["buildVersion"].ToString());
115115
Version expectedVsVersion = imageDescriptor.GetExpectedVsVersion();
116116

117+
// For VS 18 and later, only verify the major version since new minor versions release monthly.
118+
// See https://learn.microsoft.com/visualstudio/releases/2026/release-notes#december-update-1810
117119
Assert.Equal(expectedVsVersion.Major, actualVsVersion.Major);
118-
Assert.Equal(expectedVsVersion.Minor, actualVsVersion.Minor);
120+
// For VS versions < 18, continue to verify the minor version.
121+
if (expectedVsVersion.Major < 18 || actualVsVersion.Major < 18)
122+
{
123+
Assert.Equal(expectedVsVersion.Minor, actualVsVersion.Minor);
124+
}
119125
}
120126

121127
[SkippableTheory]

0 commit comments

Comments
 (0)