Enable building smoke tests as apks

- Use ReferenceXUnitWrapperGenerator != false to define SINGLE_FILE_TEST_RUNNER (android & singlefile targets) instead of IsFunctionalTest
- Condition SingleFileTestRunner compile and TrimmerRootAssembly (TestUtilities) on wrapper/generator and SkipTestUtilitiesReference
- Add Android NativeAOT publish/trim settings and set NativeLib/CustomNativeMain for android nativeaot
- Make DisableImplicitFrameworkReferences respect preexisting value and add explicit DisableImplicitFrameworkReferences=false in nativeaot tests dir
- Import testing\tests.targets when TargetsAndroid is true
- Update many NativeAOT smoke tests Main signatures to public static int Main(string[] args) to match runner invocation

Author: sbomer

eng/testing/tests.android.targets

@@ -12,7 +12,7 @@
     <BundleTestAndroidAppDependsOn>AndroidBuild</BundleTestAndroidAppDependsOn>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR' and '$(IsFunctionalTest)' != 'true'">
+  <PropertyGroup Condition="'$(RuntimeFlavor)' == 'CoreCLR' and '$(ReferenceXUnitWrapperGenerator)' != 'false'">
     <DefineConstants>$(DefineConstants);SINGLE_FILE_TEST_RUNNER</DefineConstants>
   </PropertyGroup>
 

eng/testing/tests.singlefile.targets

@@ -32,7 +32,7 @@
     <SelfContained>true</SelfContained>
   </PropertyGroup>
 
-  <PropertyGroup Condition="('$(PublishSingleFile)' == 'true' or '$(TestNativeAot)' == 'true') and '$(IsFunctionalTest)' != 'true'">
+  <PropertyGroup Condition="('$(PublishSingleFile)' == 'true' or '$(TestNativeAot)' == 'true') and '$(ReferenceXUnitWrapperGenerator)' != 'false'">
     <DefineConstants>$(DefineConstants);SINGLE_FILE_TEST_RUNNER</DefineConstants>
   </PropertyGroup>
 
@@ -44,13 +44,13 @@
 
   <ItemGroup Condition="'$(TestNativeAot)' == 'true'">
     <RdXmlFile Include="$(MSBuildThisFileDirectory)default.rd.xml" />
-    <TrimmerRootAssembly Include="TestUtilities" />
+    <TrimmerRootAssembly Include="TestUtilities" Condition="'$(SkipTestUtilitiesReference)' != 'true'" />
   </ItemGroup>
 
   <ItemGroup>
     <Compile Include="$(CommonTestPath)SingleFileTestRunner\SingleFileTestRunner.cs"
              Link="Common\SingleFileTestRunner\SingleFileTestRunner.cs"
-             Condition="'$(IsFunctionalTest)' != 'true'" />
+             Condition="'$(ReferenceXUnitWrapperGenerator)' != 'false'" />
   </ItemGroup>
 
   <ItemGroup>

src/tests/Directory.Build.props

@@ -215,7 +215,7 @@
     <ImportProjectExtensionTargets>false</ImportProjectExtensionTargets>
   </PropertyGroup>
 
-  <PropertyGroup Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvos'">
+  <PropertyGroup Condition="'$(TargetOS)' == 'ios' or '$(TargetOS)' == 'tvos' or ('$(TargetOS)' == 'android' and '$(TestBuildMode)' == 'nativeaot')">
     <EnableAggressiveTrimming Condition="'$(OutputType)' == 'Exe'">true</EnableAggressiveTrimming>
     <PublishTrimmed Condition="'$(OutputType)' == 'Exe'">true</PublishTrimmed>
     <SkipTestUtilitiesReference>true</SkipTestUtilitiesReference>
@@ -235,6 +235,11 @@
     <HybridGlobalization Condition="'$(_IsApplePlatform)' == 'true'">true</HybridGlobalization>
   </PropertyGroup>
 
+  <PropertyGroup Condition="'$(TargetOS)' == 'android' and '$(TestBuildMode)' == 'nativeaot'">
+    <NativeLib>shared</NativeLib>
+    <CustomNativeMain>true</CustomNativeMain>
+  </PropertyGroup>
+
   <Import Project="$(RepositoryEngineeringDir)testing\tests.props"  Condition="'$(IsTestsCommonProject)' != 'true'" />
   <Import Project="$(BaseOutputPath)\packages\Common\test_dependencies\test_dependencies\test_dependencies.*.props" Condition="'$(IsTestsCommonProject)' != 'true'" />
 </Project>

src/tests/Directory.Build.targets

@@ -456,7 +456,7 @@
 
 
   <PropertyGroup>
-    <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
+    <DisableImplicitFrameworkReferences Condition="'$(DisableImplicitFrameworkReferences)' == ''">true</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -508,6 +508,7 @@
   <Import Project="$(RepositoryEngineeringDir)toolAot.targets" />
   <Import Project="$(MSBuildProjectFullPath).targets" Condition="Exists('$(MSBuildProjectFullPath).targets')"/>
   <Import Project="$(RepoRoot)/src/tests/Common/mergedrunner.targets" Condition="'$(IsMergedTestRunnerAssembly)' == 'true'" />
+  <Import Project="$(RepositoryEngineeringDir)testing\tests.targets" Condition="'$(TargetsAndroid)' == 'true'" />
 
   <Target Name="GetBinPlaceTargetFramework" />
 

src/tests/nativeaot/Directory.Build.props

@@ -5,5 +5,7 @@
   <PropertyGroup>
     <!-- We expect trimming to be fully enabled in these tests -->
     <EnableAggressiveTrimming>true</EnableAggressiveTrimming>
+    <!-- We need the library import generator when running android tests. -->
+    <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
   </PropertyGroup>
 </Project>

src/tests/nativeaot/SmokeTests/AttributeTrimming/AttributeTrimming.cs

@@ -9,7 +9,7 @@
 class Program
 {
     [Method]
-    static int Main()
+    public static int Main(string[] args)
     {
         // Sanity check: we don't currently expect attributes on types to be optimized away
         if (GetTypeSecretly(nameof(TypeAttribute)) == null)

src/tests/nativeaot/SmokeTests/ControlFlowGuard/ControlFlowGuard.cs

@@ -30,7 +30,7 @@ unsafe class ControlFlowGuardTests
 
     static bool s_armed;
 
-    static int Main(string[] args)
+    public static int Main(string[] args)
     {
         // Are we running the control program?
         if (args.Length == 0)

src/tests/nativeaot/SmokeTests/Exceptions/Exceptions.cs

@@ -24,7 +24,7 @@ public BringUpTest()
 
     static int finallyCounter = 0;
 
-    public static int Main()
+    public static int Main(string[] args)
     {
         // This test also doubles as server GC test
         if (!System.Runtime.GCSettings.IsServerGC)

src/tests/nativeaot/SmokeTests/HardwareIntrinsics/Program.cs

@@ -9,7 +9,7 @@
 
 unsafe class Program
 {
-    static int Main()
+    public static int Main(string[] args)
     {
         s_success = true;
 

src/tests/nativeaot/SmokeTests/MultiModule/MultiModule.cs

@@ -11,7 +11,7 @@ public class ReflectionTest
     const int Pass = 100;
     const int Fail = -1;
 
-    public static int Main()
+    public static int Main(string[] args)
     {
         if (TestStaticBases() == Fail)
             return Fail;