Tagging subscribers to this area: @JulieLeeMSFT, @jakobbotsch
See info in area-owners.md if you want to be subscribed.

Can we fix the test scripts instead of adding these redundant annotations?

Can we fix the test scripts instead of adding these redundant annotations?

That would require adding [ConditionalFact] to each test method which would be equally redundant, unless there's some way to mass-annotate that I don't know of.

I removed the CLRTestTargetUnsupported from the merged target project, it's not necessary anymore.

EDIT: tests failing, it's probably necessary, I'll try [ConditionalFact]s

I removed the CLRTestTargetUnsupported from the merged target project, it's not necessary anymore.

EDIT: tests failing, it's probably necessary, I'll try [ConditionalFact]s

[ConditionalFact]s look messy in IL. The test failures could be side-stepped with <RequiresProcessIsolation> but that defeats the purpose of a merged test target. I reverted CLRTestTargetUnsupported in the merged target. I ran out of ideas to make it less redundant, it probably has to stay this way.

@jkoritzinsky Is there a way to make CLRTestTargetUnsupported work for BuildAllTestsAsStandalone=true?

I'd recommend using ConditionalFact as I want us to move to the attributes overall. There is a nice syntax for IL that I found that we've used for a few tests. Attributes will work for all cases.

I'd recommend using ConditionalFact as I want us to move to the attributes overall.

I tried ConditionalFact but apparently it needs XUnitWrapperGenerator to pick up the attributes and generate Main method.

The only thing I got working so far with and without BuildAllTestsAsStandalone=true and without a redundant CLRTestTargetUnsupported tag in ilproj is to make your own Main():

.method public static int32 Main()
{
  .entrypoint
  .maxstack  1

  call       bool [TestLibrary]TestLibrary.PlatformDetection::get_IsWindows()
  brtrue.s DoTest
  ldc.i4 100
  ret

DoTest:
  call       int32 MCCTest.MyClass::Test()
  ret
}

The ConditionalFacts in IL CLR tests have a redundant condition in the build project which we're trying to avoid, e.g.

There is a nice syntax for IL that I found that we've used for a few tests. Attributes will work for all cases.

Can you point me to these tests that avoid the above-mentioned problems?

There is a nice syntax for IL

For reference,

// [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is32BitProcess))]
.custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) =
{
    type ([TestLibrary]TestLibrary.PlatformDetection)
    string[1] ('Is32BitProcess')
}

// [ConditionalFact(typeof(TestLibrary.PlatformDetection), nameof(TestLibrary.PlatformDetection.Is32BitProcess))]
.custom instance void [Microsoft.DotNet.XUnitExtensions]Xunit.ConditionalFactAttribute::.ctor(class [System.Runtime]System.Type, string[]) =
{
    type ([TestLibrary]TestLibrary.PlatformDetection)
    string[1] ('Is32BitProcess')
}

Thanks, it looks nicer. Still the problem was no Main() is generated off of the attribute, I don't see it working anywhere else in CLR tests without the condition doubled in .ilproj.

Still the problem was no Main() is generated off of the attribute

'ReferenceXUnitWrapperGenerator' was not set for IL, this change at least puts a project reference:

--- a/src/tests/Directory.Build.targets
+++ b/src/tests/Directory.Build.targets
@@ -493,7 +493,7 @@
     </ItemGroup>
   </Target>

-  <PropertyGroup Condition="'$(Language)' == 'C#' and '$(_CLRTestNeedsToRun)' == 'true' and ('$(BuildAsStandalone)' == 'true' or '$(RequiresProcessIsolation)' == 'true' or '$(InMergedTestDirectory)' == 'true' or '$(IsMergedTestRunnerAssembly)' == 'true')">
+  <PropertyGroup Condition="('$(Language)' == 'C#' or '$(Language)' == 'IL') and '$(_CLRTestNeedsToRun)' == 'true' and ('$(BuildAsStandalone)' == 'true' or '$(RequiresProcessIsolation)' == 'true' or '$(InMergedTestDirectory)' == 'true' or '$(IsMergedTestRunnerAssembly)' == 'true')">
     <ReferenceXUnitWrapperGenerator Condition="'$(ReferenceXUnitWrapperGenerator)' == ''">true</ReferenceXUnitWrapperGenerator>
   </PropertyGroup>

Still, the wrapper generator is not called.

The wrapper generator won't be called for IL. You'll need to add a Main method into each IL project that manually calls the different cases.