From 2d028f537c87f247fc1b333433e2cb4149db67b2 Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 17 Jun 2024 10:50:54 -0700 Subject: [PATCH 1/2] Move downlevel tests to outerloop Fixes https://github.com/dotnet/runtime/issues/103541 --- .../Compiles.cs | 30 +++++++++++++++++-- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs index 43fdaf49300379..30400bf69dac54 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs @@ -718,11 +718,35 @@ public class Basic { } yield return new object[] { ID(), source, TestTargetFramework.Net }; } + [Fact] + public async Task ValidateNoGeneratedOutputForNoImport() + { + string source = """ + using System.Runtime.InteropServices; + public class Basic { } + """; + + var test = new NoChangeTest(TestTargetFramework.Net) + { + TestCode = source, + TestBehaviors = TestBehaviors.SkipGeneratedSourcesCheck + }; + + await test.RunAsync(); + } + + + [OuterLoop("Uses the network for downlevel ref packs")] + [InlineData(TestTargetFramework.Standard)] + [InlineData(TestTargetFramework.Framework)] [Theory] - [MemberData(nameof(CodeSnippetsToVerifyNoTreesProduced))] - public async Task ValidateNoGeneratedOutputForNoImport(string id, string source, TestTargetFramework framework) + public async Task ValidateNoGeneratedOutputForNoImportDownlevel(TestTargetFramework framework) { - TestUtils.Use(id); + string source = """ + using System.Runtime.InteropServices; + public class Basic { } + """; + var test = new NoChangeTest(framework) { TestCode = source, From 99ffb207b958d9830d9a0a9bb6de42b26708df9d Mon Sep 17 00:00:00 2001 From: Jeremy Koritzinsky Date: Mon, 17 Jun 2024 10:51:58 -0700 Subject: [PATCH 2/2] Remove MemberData method that is now unused --- .../LibraryImportGenerator.UnitTests/Compiles.cs | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs index 30400bf69dac54..b7d672d45493ed 100644 --- a/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs +++ b/src/libraries/System.Runtime.InteropServices/tests/LibraryImportGenerator.UnitTests/Compiles.cs @@ -707,17 +707,6 @@ private static string RemoveTestMarkup(string sourceWithMarkup) return sourceWithoutMarkup; } - public static IEnumerable CodeSnippetsToVerifyNoTreesProduced() - { - string source = """ - using System.Runtime.InteropServices; - public class Basic { } - """; - yield return new object[] { ID(), source, TestTargetFramework.Standard }; - yield return new object[] { ID(), source, TestTargetFramework.Framework }; - yield return new object[] { ID(), source, TestTargetFramework.Net }; - } - [Fact] public async Task ValidateNoGeneratedOutputForNoImport() {