[mono] Pass category=failing and category=outerloop to Android and iOS (#35665)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index 25d0a50..39540bb 100644 (file)
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -15,7 +15,7 @@
       ]
     },
     "microsoft.dotnet.xharness.cli": {
-      "version": "1.0.0-prerelease.20227.9",
+      "version": "1.0.0-prerelease.20230.1",
       "commands": [
         "xharness"
       ]

diff --git a/eng/testing/tests.targets b/eng/testing/tests.targets
index bccb7df..9b692a5 100644 (file)
--- a/eng/testing/tests.targets
+++ b/eng/testing/tests.targets
@@ -156,6 +156,8 @@
     <Copy SourceFiles="@(AndroidTestRunnerBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
     <Copy SourceFiles="@(BclBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
 
+    <WriteLinesToFile File="$(BundleDir)\xunit-excludes.txt" Lines="$(_withoutCategories.Replace(';', '%0dcategory='))" />
+
     <AndroidAppBuilderTask 
         Abi="$(AndroidAbi)"
         ProjectName="$(AssemblyName)"
@@ -194,8 +196,6 @@
       <!-- remove PDBs to save some space until we integrate ILLink -->
       <BclBinaries Remove="$(RuntimePackDir)\lib\$(NetCoreAppCurrent)\*.pdb" />
     </ItemGroup>
-    <Error Condition="$(TargetArchitecture.StartsWith('arm')) and '$(DevTeamProvisioning)' == ''" 
-           Text="'DevTeamProvisioning' shouldn't be empty for arm64" />
     <Error Condition="!Exists('$(AppleTestRunner)')" Text="AppleTestRunner=$(AppleTestRunner) doesn't exist" />
     <Error Condition="!Exists('$(RuntimePackDir)')" Text="RuntimePackDir=$(RuntimePackDir) doesn't exist" />
     <RemoveDir Directories="$(BundleDir)" />
@@ -203,6 +203,7 @@
     <Copy SourceFiles="@(AppleTestRunnerBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
     <Copy SourceFiles="@(BclBinaries)" DestinationFolder="$(BundleDir)\%(RecursiveDir)" SkipUnchangedFiles="true"/>
 
+    <WriteLinesToFile File="$(BundleDir)\xunit-excludes.txt" Lines="$(_withoutCategories.Replace(';', '%0dcategory='))" />
     <!-- Run App bundler, it should AOT libs (if needed), link all native bits, compile simple UI (written in ObjC)
          and produce an app bundle (with xcode project) -->
     <AppleAppBuilderTask 
@@ -225,6 +226,8 @@
     </AppleAppBuilderTask>
     <Message Importance="High" Text="Xcode: $(XcodeProjectPath)"/>
     <Message Importance="High" Text="App: $(AppBundlePath)"/>
+    <Error Condition="$(TargetArchitecture.StartsWith('arm')) and '$(DevTeamProvisioning)' == ''" 
+           Text="'DevTeamProvisioning' shouldn't be empty for arm64" />
     <!-- This app is now can be consumed by xharness CLI to deploy on a device or simulator -->
   </Target>
 

diff --git a/src/mono/msbuild/AndroidTestRunner/AndroidTestRunner.cs b/src/mono/msbuild/AndroidTestRunner/AndroidTestRunner.cs
index 26429be..c223eba 100644 (file)
--- a/src/mono/msbuild/AndroidTestRunner/AndroidTestRunner.cs
+++ b/src/mono/msbuild/AndroidTestRunner/AndroidTestRunner.cs
@@ -65,6 +65,8 @@ public class SimpleAndroidTestRunner : AndroidApplicationEntryPoint, IDevice
 
     protected override string? IgnoreFilesDirectory => null;
 
+    protected override string IgnoredTraitsFilePath => "xunit-excludes.txt";
+
     public string BundleIdentifier => "net.dot." + s_MainTestName;
 
     public string? UniqueIdentifier { get; }

diff --git a/src/mono/msbuild/AppleTestRunner/AppleTestRunner.cs b/src/mono/msbuild/AppleTestRunner/AppleTestRunner.cs
index dc1f045..9fa35b6 100644 (file)
--- a/src/mono/msbuild/AppleTestRunner/AppleTestRunner.cs
+++ b/src/mono/msbuild/AppleTestRunner/AppleTestRunner.cs
@@ -128,6 +128,8 @@ public class SimpleTestRunner : iOSApplicationEntryPoint, IDevice
 
     protected override string? IgnoreFilesDirectory => null;
 
+    protected override string IgnoredTraitsFilePath => "xunit-excludes.txt";
+
     public string BundleIdentifier => "net.dot." + s_MainTestName;
 
     public string? UniqueIdentifier { get; }