Skip to content

Only verify VS 18 major version in tests #1281

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.

Sign up for GitHub

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
lbussell merged 2 commits into from
Jan 8, 2026
Merged

Only verify VS 18 major version in tests #1281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
583cb79
Only verify VS 18 major version in tests
lbussell Dec 10, 2025
2dbae3c
Fix version parsing to append ".0" for single number versions
lbussell Jan 8, 2026
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
2 changes: 1 addition & 1 deletion manifest.versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
11 changes: 10 additions & 1 deletion tests/Microsoft.DotNet.Framework.Docker.Tests/ImageDescriptorExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}

/// <summary>
Expand Down
8 changes: 7 additions & 1 deletion tests/Microsoft.DotNet.Framework.Docker.Tests/SdkOnlyImageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down