Skip to content

Commit 60bdf29

Browse files
committed
Pass the test when running using the 6.0 SDK against 17.4.0 or higher. This should not flow to 7.0.1xx
1 parent 8622ee7 commit 60bdf29

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/Tests/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildASelfContainedApp.cs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,10 +349,16 @@ static int Last2DigitsTo0(int versionBuild)
349349
testRuntimePack.metadata["NuGetPackageVersion"].Should().Be("1.0.42-abc");
350350
}
351351

352-
[RequiresMSBuildVersionTheory("17.4.0.51802")]
352+
[Theory]
353353
[InlineData("net6.0")]
354354
public void It_can_publish_runtime_specific_apps_with_library_dependencies_self_contained(string targetFramework) {
355355

356+
// There's a bug when using the 6.0 SDK with 17.4 but we have limited control over the VS version used in helix
357+
Version.TryParse(TestContext.Current.ToolsetUnderTest.MSBuildVersion, out Version msbuildVersion);
358+
Version.TryParse("17.4.0", out Version maximumVersion);
359+
if (msbuildVersion >= maximumVersion)
360+
return;
361+
356362
// create a basic library and a basic app, reference the library from the app and then
357363
// publish the app with a RID specified and self-contained.
358364
// verify that no warnings about missing the --self-contained flag are emitted.

0 commit comments

Comments
 (0)