Fix XUnitWrapperGenerator handling of SkipOnCoreClrAttribute with no runtime test modes

src/tests/Common/XUnitWrapperGenerator/ITestInfo.cs

@@ -147,12 +147,17 @@ public ConditionalTest(ITestInfo innerTest, string condition)
 
         _innerTest = innerTest;
         _condition = condition;
-   }
+    }
 
     public ConditionalTest(ITestInfo innerTest, Xunit.TestPlatforms platform)
         : this(innerTest, GetPlatformConditionFromTestPlatform(platform))
     {
     }
+
+    public ConditionalTest(ITestInfo innerTest, string condition, Xunit.TestPlatforms platform)
+        :this(innerTest, $"{(condition.Length == 0 ? "true" : condition)} && ({GetPlatformConditionFromTestPlatform(platform)})")
+    {
+    }
 
     public string TestNameExpression { get; }
     public string DisplayNameForFiltering { get; }
@@ -207,6 +212,16 @@ private static string GetPlatformConditionFromTestPlatform(Xunit.TestPlatforms p
     {
         List<string> platformCheckConditions = new();
 
+        if (platform == Xunit.TestPlatforms.Any)
+        {
+            return "false";
+        }
+
+        if (platform == 0)
+        {
+            return "true";
+        }
+
         if (platform.HasFlag(Xunit.TestPlatforms.Windows))
         {
             platformCheckConditions.Add("global::System.OperatingSystem.IsWindows()");

src/tests/Common/XUnitWrapperGenerator/XUnitWrapperGenerator.cs

@@ -847,9 +847,9 @@
                         continue;
                     }
 
-                    Xunit.TestPlatforms skippedTestPlatforms = 0;
-                    Xunit.RuntimeConfiguration skippedConfigurations = 0;
-                    Xunit.RuntimeTestModes skippedTestModes = 0;
+                    Xunit.TestPlatforms skippedTestPlatforms = Xunit.TestPlatforms.Any;
+                    Xunit.RuntimeConfiguration skippedConfigurations = Xunit.RuntimeConfiguration.Any;
+                    Xunit.RuntimeTestModes skippedTestModes = Xunit.RuntimeTestModes.Any;
 
                     for (int i = 1; i < filterAttribute.ConstructorArguments.Length; i++)
                     {
@@ -875,12 +875,13 @@
                         }
                     }
 
-                    if (skippedTestModes == Xunit.RuntimeTestModes.Any)
+                    if (skippedTestModes == Xunit.RuntimeTestModes.Any
+                        && skippedConfigurations == Xunit.RuntimeConfigurations.Any
+                        && skippedTestPlatforms == Xunit.TestPlatforms.Any)
                     {
                         testInfos = FilterForSkippedRuntime(testInfos, (int)Xunit.TestRuntimes.CoreCLR, options);
                     }
-                    testInfos = DecorateWithSkipOnPlatform(testInfos, (int)skippedTestPlatforms, options);
-                    testInfos = DecorateWithSkipOnCoreClrConfiguration(testInfos, skippedTestModes, skippedConfigurations);
+                    testInfos = DecorateWithSkipOnCoreClrConfiguration(testInfos, skippedTestModes, skippedConfigurations, skippedTestPlatforms, options);
 
                     break;
             }
@@ -889,15 +890,10 @@
         return testInfos;
     }
 
-    private static ImmutableArray<ITestInfo> DecorateWithSkipOnCoreClrConfiguration(ImmutableArray<ITestInfo> testInfos, Xunit.RuntimeTestModes skippedTestModes, Xunit.RuntimeConfiguration skippedConfigurations)
+    private static ImmutableArray<ITestInfo> DecorateWithSkipOnCoreClrConfiguration(ImmutableArray<ITestInfo> testInfos, Xunit.RuntimeTestModes skippedTestModes, Xunit.RuntimeConfiguration skippedConfigurations, Xunit.TestPlatforms skippedTestPlatforms)
     {
         const string ConditionClass = "TestLibrary.CoreClrConfigurationDetection";
         List<string> conditions = new();
-        if (skippedConfigurations.HasFlag(Xunit.RuntimeConfiguration.Debug | Xunit.RuntimeConfiguration.Checked | Xunit.RuntimeConfiguration.Release))
-        {
-            // If all configurations are skipped, just skip the test as a whole
-            return ImmutableArray<ITestInfo>.Empty;
-        }
 
         if (skippedConfigurations.HasFlag(Xunit.RuntimeConfiguration.Debug))
         {
@@ -961,7 +957,7 @@
             conditions.Add($"!{ConditionClass}.IsGCStressC");
         }
 
-        return ImmutableArray.CreateRange<ITestInfo>(testInfos.Select(t => new ConditionalTest(t, string.Join(" && ", conditions))));
+        return ImmutableArray.CreateRange<ITestInfo>(testInfos.Select(t => new ConditionalTest(t, string.Join(" && ", conditions), ~skippedTestPlatforms)));
     }
 
     private static ImmutableArray<ITestInfo> FilterForSkippedTargetFrameworkMonikers(ImmutableArray<ITestInfo> testInfos, int v)