Add a target to run application with logging

Documentation/guides/building-apps/build-targets.md

@@ -96,6 +96,18 @@ MSBuild property controls which
 [Visual Studio SDK Manager repository](~/android/get-started/installation/android-sdk.md?tabs=windows#repository-selection)
 is used for package name and package version detection, and URLs to download.
 
+## RunWithLogging
+
+Runs the application with additional logging enabled.  Helpful when reporting or investigating an issue with
+either the application or the runtime.  If successful, messages printed to the screen will show location
+of the logcat file with the logged messages.
+
+Properties which affect how the target works:
+
+  * `/p:RunLogVerbose=true` enables even more verbose logging from MonoVM
+  * `/p:RunLogDelayInMS=X` where `X` should be replaced with time in milliseconds to wait before writing the
+    log output to file.  Defaults to `1000`.
+
 ## SignAndroidPackage
 
 Creates and signs the Android package (`.apk`) file.

Documentation/workflow/DevelopmentTips.md

@@ -452,7 +452,7 @@ A second (better) way is to add this MSBuild target to your Android
 ```xml
 <Target Name="UpdateMonoRuntimePacks" BeforeTargets="ProcessFrameworkReferences">
   <ItemGroup>
-      <KnownRuntimePack 
+      <KnownRuntimePack
           Update="Microsoft.NETCore.App"
           Condition=" '%(KnownRuntimePack.TargetFramework)' == 'net6.0' "
           LatestRuntimeFrameworkVersion="6.0.0-preview.7.21364.3"
@@ -477,6 +477,31 @@ automatically picked up by the .NET SDK.
 
 ## Enabling Mono Logging
 
+### The easy way
+
+A quick way to enable Mono logging is to use the `RunWithLogging`
+target:
+
+```bash
+$ dotnet build -t:RunWithLogging
+```
+
+If successful, messages printed to the screen will show location
+of the logcat file with the logged messages.
+
+Verbosity of logging can be increased by setting the `$(RunLogVerbose)`
+property to `true`, in which case the log output file will contain
+(very) verbose log messages from the MonoVM runtime.
+
+By default, the target will wait for a 1000ms before it dumps the
+logcat buffer to file.  This is to give the Android logging daemon
+time to actually put all the messages logged by the application in
+the logcat buffer.  This value can be overridden by setting the
+`$(RunLogDelayInMS)` MSBuild property to a number of milliseconds that
+the target should wait before creating the log file.
+
+### The manual way
+
 Since [6e58ce4][6e58ce4], logging from Mono is no longer enabled by
 default. You can set the `debug.mono.log` system property to answer
 questions like: Is AOT working? Is the Mono Interpreter enabled?

build-tools/scripts/TestApks.targets

@@ -12,7 +12,7 @@
   <UsingTask AssemblyFile="$(BootstrapTasksAssembly)" TaskName="Xamarin.Android.Tools.BootstrapTasks.StartAndroidEmulator" />
   <UsingTask AssemblyFile="$(BootstrapTasksAssembly)" TaskName="Xamarin.Android.Tools.BootstrapTasks.KillProcess" />
   <UsingTask AssemblyFile="$(BootstrapTasksAssembly)" TaskName="Xamarin.Android.Tools.BootstrapTasks.WaitForAndroidEmulator" />
-  <UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.Sleep" />
+  <UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.XASleepInternal" />
   <UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ProcessLogcatTiming" />
   <UsingTask AssemblyFile="$(PrepTasksAssembly)" TaskName="Xamarin.Android.BuildTools.PrepTasks.ProcessApkSizes" />
 
@@ -160,7 +160,7 @@
         ContinueOnError="WarnAndContinue"
         Command="kill -HUP $(_EmuPid)"
     />
-    <Sleep
+    <XASleepInternal
         Condition=" '$(HostOS)' != 'Windows' And '$(_EmuTarget)' != '' "
         Milliseconds="5000"
     />
@@ -375,7 +375,7 @@
         ContinueOnError="true">
       <Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />
     </Exec>
-    <Sleep
+    <XASleepInternal
         Milliseconds="5000"
         Condition=" '$(_SdkManagerExitCode)' != '0' "
     />
@@ -386,7 +386,7 @@
         Condition=" '$(_SdkManagerExitCode)' != '0' ">
       <Output TaskParameter="ExitCode" PropertyName="_SdkManagerExitCode" />
     </Exec>
-    <Sleep
+    <XASleepInternal
         Milliseconds="10000"
         Condition=" '$(_SdkManagerExitCode)' != '0' "
     />

build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/Sleep.cs

@@ -3,19 +3,21 @@
 
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
+using Microsoft.Android.Build.Tasks;
+
+using TPLTask = System.Threading.Tasks.Task;
 
 namespace Xamarin.Android.BuildTools.PrepTasks
 {
-	public class Sleep : Task
+	public class XASleepInternal : AndroidAsyncTask
 	{
+		public override string TaskPrefix => "XASI";
 		public int Milliseconds { get; set; }
 
-		public override bool Execute ()
+		public override TPLTask RunTaskAsync ()
 		{
 			Log.LogMessage (MessageImportance.Normal, $"Going to sleep for {Milliseconds}ms");
-			Thread.Sleep (Milliseconds);
-
-			return true;
+			return TPLTask.Delay (Milliseconds, CancellationToken);
 		}
 	}
 }

build-tools/xa-prep-tasks/xa-prep-tasks.csproj

@@ -9,4 +9,8 @@
   <Import Project="..\..\Configuration.props" />
   <Import Project="..\..\external\xamarin-android-tools\src\Microsoft.Android.Build.BaseTasks\MSBuildReferences.projitems" />
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\external\xamarin-android-tools\src\Microsoft.Android.Build.BaseTasks\Microsoft.Android.Build.BaseTasks.csproj" />
+  </ItemGroup>
+
 </Project>

src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Application.targets

@@ -7,6 +7,8 @@ This file contains targets specific for Android application projects.
 ***********************************************************************************************
 -->
 <Project>
+  <UsingTask TaskName="Xamarin.Android.Tasks.GetAndroidActivityName" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
+  <UsingTask TaskName="Xamarin.Android.BuildTools.PrepTasks.XASleepInternal" AssemblyFile="$(_XamarinAndroidBuildTasksAssembly)" />
 
   <PropertyGroup>
     <UseAppHost>false</UseAppHost>
@@ -28,4 +30,42 @@ This file contains targets specific for Android application projects.
 
   <Target Name="Run" DependsOnTargets="$(_RunDependsOn)" />
 
+  <PropertyGroup>
+    <_RunWithLoggingDependsOn>
+      Install;
+    </_RunWithLoggingDependsOn>
+
+    <_RunLogFilePath Condition=" '$(_RunLogFilePath)' == '' ">$(IntermediateOutputPath)logcat.txt</_RunLogFilePath>
+    <RunLogVerbose Condition=" '$(RunLogVerbose)' == '' ">false</RunLogVerbose>
+  </PropertyGroup>
+
+  <Target Name="RunWithLogging"
+          DependsOnTargets="$(_RunWithLoggingDependsOn)">
+    <GetAndroidActivityName
+        Condition=" '$(AndroidLaunchActivity)' == '' "
+        ManifestFile="$(IntermediateOutputPath)android\AndroidManifest.xml">
+      <Output TaskParameter="ActivityName" PropertyName="AndroidLaunchActivity" />
+    </GetAndroidActivityName>
+
+    <PropertyGroup>
+      <_MonoLog>default,assembly,timing=bare</_MonoLog>
+      <_MonoLog Condition=" '$(RunLogVerbose)' != 'false' ">$(_MonoLog),mono_log_level=debug,mono_log_mask=all</_MonoLog>
+      <RunLogDelayInMS>1000</RunLogDelayInMS> <!-- milliseconds -->
+    </PropertyGroup>
+
+    <Message Text="Preparing application to log more information" Importance="High" />
+    <Message Text="Setting the debug.mono.log property to: $(_MonoLog)" Importance="High" />
+    <Exec Command="&quot;$(AdbToolPath)adb&quot; $(AdbTarget) shell setprop debug.mono.log $(_MonoLog)" />
+    <Exec Command="&quot;$(AdbToolPath)adb&quot; $(AdbTarget) logcat -G 16M" />
+    <Exec Command="&quot;$(AdbToolPath)adb&quot; $(AdbTarget) logcat -c" />
+
+    <Message Text="Running the application and waiting for it to fully start" Importance="High" />
+    <Exec Command="&quot;$(AdbToolPath)adb&quot; $(AdbTarget) shell am start -S -W -n &quot;$(_AndroidPackage)/$(AndroidLaunchActivity)&quot;" />
+
+    <Message Text="Sleeping for $(RunLogDelayInMS)ms to give logcat a chance to log all the messages" Importance="High" />
+    <XASleepInternal Milliseconds="$(RunLogDelayInMS)" />
+
+    <Exec Command="&quot;$(AdbToolPath)adb&quot; $(AdbTarget) logcat -d > &quot;$(_RunLogFilePath)&quot;" />
+    <Message Text="Logcat output is available in $(_RunLogFilePath)" Importance="High" />
+  </Target>
 </Project>

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.csproj

@@ -312,6 +312,9 @@
     <Compile Include="..\Mono.Android\\Android\NativeLibraryReferenceAttribute.cs">
       <Link>Mono.Android\NativeLibraryReferenceAttribute.cs</Link>
     </Compile>
+    <Compile Include="..\..\build-tools\xa-prep-tasks\Xamarin.Android.BuildTools.PrepTasks\Sleep.cs">
+      <Link>Xamarin.Android.BuildTools.PrepTasks\Sleep.cs</Link>
+    </Compile>
     <_MonoAndroidEnum Include="$(AndroidGeneratedClassDirectory)\Android.Content.PM.LaunchMode.cs" />
     <_MonoAndroidEnum Include="$(AndroidGeneratedClassDirectory)\Android.Content.PM.ScreenOrientation.cs" />
     <_MonoAndroidEnum Include="$(AndroidGeneratedClassDirectory)\Android.Content.PM.ConfigChanges.cs" />