From 1a450f1c2adc7d78dc00827c67aa0f6815d42bda Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Tue, 27 Jul 2021 16:47:06 -0500
Subject: [PATCH] Fix AOT tests in Mono.Android.NET-Tests.csproj

* had the wrong file path for `TestResults-*.xml`
* `$(ExcludeCategories)` should include `DotNetIgnore` and `InetAccess`
---
 build-tools/automation/azure-pipelines.yaml                 | 5 ++---
 .../Mono.Android.NET-Tests.csproj                           | 6 +++++-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 3df4deb4a93..6181a5e4e5f 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -803,9 +803,8 @@ stages:
         configuration: $(XA.Build.Configuration)
         testName: Mono.Android.NET_Tests-Aot
         project: tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
-        testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)-Aot.xml
-        # InetAccess excluded due to: https://github.com/dotnet/runtime/issues/56315
-        extraBuildArgs: /p:RunAOTCompilation=true /p:ExcludeCategories=InetAccess
+        testResultsFiles: TestResult-Mono.Android.NET_Tests-$(XA.Build.Configuration)Aot.xml
+        extraBuildArgs: /p:RunAOTCompilation=true
         artifactSource: bin/Test$(XA.Build.Configuration)/net6.0-android/Mono.Android.NET_Tests-Signed.apk
         artifactFolder: net6-aot
         useDotNet: true
diff --git a/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj b/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
index 296d426a057..9cb12a9b4ca 100644
--- a/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
+++ b/tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
@@ -19,8 +19,12 @@
     <EnableDefaultAndroidAssetItems>false</EnableDefaultAndroidAssetItems>
     <_MonoAndroidTestPackage>Mono.Android.NET_Tests</_MonoAndroidTestPackage>
     <PlotDataLabelSuffix>-$(TestsFlavor)NET6</PlotDataLabelSuffix>
-    <!-- TODO: Fix excluded tests -->
+    <!--
+      TODO: Fix excluded tests
+      For AOT, InetAccess excluded due to: https://github.com/dotnet/runtime/issues/56315
+    -->
     <ExcludeCategories>DotNetIgnore</ExcludeCategories>
+    <ExcludeCategories Condition=" '$(RunAOTCompilation)' == 'true' ">$(ExcludeCategories):InetAccess</ExcludeCategories>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">