From 33677f02250a890871cd1a3ba99413623e459bac Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 11 Jun 2024 18:47:16 -0400 Subject: [PATCH 01/12] Use AsyncTask from xamarin-android-tools We've decided to move https://github.com/xamarin/Xamarin.Build.AsyncTask into xamarin-android-tools as part of dotnet org migration efforts. --- .external | 2 +- external/xamarin-android-tools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index 39511b205a8..55ef65151ea 100644 --- a/.external +++ b/.external @@ -1 +1 @@ -xamarin/monodroid:main@93ab95e18077d56d9d55ce7b4069a534e2dea35e +xamarin/monodroid:main@ae876c994e5902f429e0e5cf04e5918c82ecc762 diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index da2c33e8ff4..02e2827c95b 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit da2c33e8ff4ee71a5b96917caaad5bdb2e87a89f +Subproject commit 02e2827c95b3621e9e96de7136c10217b1a05dc3 From 833d3191f275e77471ab021ed437034107fb7969 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 11 Jun 2024 19:02:29 -0400 Subject: [PATCH 02/12] Remove old AsyncTask usage --- .../Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs | 2 -- build-tools/installers/create-installers.targets | 2 -- src-ThirdParty/android-platform-tools-base/SymbolWriter.cs | 1 - src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs | 1 - src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs | 1 - .../Tasks/CalculateLayoutCodeBehind.cs | 1 - src/Xamarin.Android.Build.Tasks/Tasks/CompileNativeAssembly.cs | 1 - src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.cs | 1 - .../Tasks/GenerateLibraryResources.cs | 1 - .../Tasks/LinkApplicationSharedLibraries.cs | 1 - .../Xamarin.Android.Build.Tasks.targets | 2 -- 11 files changed, 14 deletions(-) diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs index aec31654934..fbac9a49e21 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs @@ -6,8 +6,6 @@ using Microsoft.Build.Framework; using Microsoft.Build.Utilities; -using Xamarin.Build; - using Tasks = System.Threading.Tasks; namespace Xamarin.Android.Tools.BootstrapTasks diff --git a/build-tools/installers/create-installers.targets b/build-tools/installers/create-installers.targets index daa577014a5..adf273ae3d5 100644 --- a/build-tools/installers/create-installers.targets +++ b/build-tools/installers/create-installers.targets @@ -165,8 +165,6 @@ <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Tools.AndroidSdk.dll" /> <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Tools.AndroidSdk.pdb" /> <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Android.Tools.Versions.props" /> - <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Build.AsyncTask.dll" /> - <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)Xamarin.Build.AsyncTask.pdb" /> <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)K4os.Compression.LZ4.dll" /> <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)ELFSharp.dll" /> <_MSBuildFiles Include="$(MicrosoftAndroidSdkOutDir)ManifestOverlays\Timing.xml" /> diff --git a/src-ThirdParty/android-platform-tools-base/SymbolWriter.cs b/src-ThirdParty/android-platform-tools-base/SymbolWriter.cs index 0455fce2d6a..0b79d4d8e83 100644 --- a/src-ThirdParty/android-platform-tools-base/SymbolWriter.cs +++ b/src-ThirdParty/android-platform-tools-base/SymbolWriter.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Text; using Xamarin.Android.Tools; -using Xamarin.Build; using Microsoft.Android.Build.Tasks; namespace Xamarin.Android.Tasks diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs index 28041f54c1e..87535f38721 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs @@ -13,7 +13,6 @@ using System.Text.RegularExpressions; using System.Collections.Generic; using Xamarin.Android.Tools; -using Xamarin.Build; using Microsoft.Android.Build.Tasks; namespace Xamarin.Android.Tasks diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs index 7f35ba57894..148725a031b 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs @@ -15,7 +15,6 @@ using System.Collections.Concurrent; using Xamarin.Android.Tools; using ThreadingTasks = System.Threading.Tasks; -using Xamarin.Build; using Microsoft.Android.Build.Tasks; namespace Xamarin.Android.Tasks { diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CalculateLayoutCodeBehind.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CalculateLayoutCodeBehind.cs index 5759809c338..2d16b10fbf5 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/CalculateLayoutCodeBehind.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/CalculateLayoutCodeBehind.cs @@ -11,7 +11,6 @@ using Microsoft.Build.Utilities; using Microsoft.Build.Framework; -using Xamarin.Build; using Microsoft.Android.Build.Tasks; namespace Xamarin.Android.Tasks diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CompileNativeAssembly.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CompileNativeAssembly.cs index 2dca284c933..b5d5a68a312 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/CompileNativeAssembly.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/CompileNativeAssembly.cs @@ -8,7 +8,6 @@ using Microsoft.Build.Utilities; using Xamarin.Android.Tools; -using Xamarin.Build; using Microsoft.Android.Build.Tasks; namespace Xamarin.Android.Tasks diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.cs index 1c721326b42..d69d599f348 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.cs @@ -11,7 +11,6 @@ using Microsoft.Build.Utilities; using Microsoft.Build.Framework; -using Xamarin.Build; using Microsoft.Android.Build.Tasks; namespace Xamarin.Android.Tasks diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs index 9b898c5e45f..8fc56372b18 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs @@ -5,7 +5,6 @@ using System.Linq; using System.Text; using Xamarin.Android.Tools; -using Xamarin.Build; using Microsoft.Android.Build.Tasks; namespace Xamarin.Android.Tasks diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/LinkApplicationSharedLibraries.cs b/src/Xamarin.Android.Build.Tasks/Tasks/LinkApplicationSharedLibraries.cs index 5f4b09ececa..b54446d0151 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/LinkApplicationSharedLibraries.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/LinkApplicationSharedLibraries.cs @@ -9,7 +9,6 @@ using Microsoft.Build.Utilities; using Xamarin.Android.Tools; -using Xamarin.Build; using Microsoft.Android.Build.Tasks; namespace Xamarin.Android.Tasks diff --git a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets index 3e2d20ceb09..0d0578566fa 100644 --- a/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets +++ b/src/Xamarin.Android.Build.Tasks/Xamarin.Android.Build.Tasks.targets @@ -313,8 +313,6 @@ <_ExtraPackageSource Include="$(PkgXamarin_LibZipSharp)\lib\$(TargetFrameworkNETStandard)\libZipSharp.pdb" /> <_ExtraPackageTarget Include="$(OutputPath)\libZipSharp.pdb" /> - <_ExtraPackageSource Include="$(PkgXamarin_Build_AsyncTask)\lib\$(TargetFrameworkNETStandard)\Xamarin.Build.AsyncTask.pdb" /> - <_ExtraPackageTarget Include="$(OutputPath)\Xamarin.Build.AsyncTask.pdb" /> <_ExtraPackageSource Include="$(PkgMono_Cecil)\lib\$(TargetFrameworkNETStandard)\Mono.Cecil.pdb" /> <_ExtraPackageTarget Include="$(OutputPath)\Mono.Cecil.pdb" /> <_ExtraPackageSource Include="$(PkgMono_Cecil)\lib\$(TargetFrameworkNETStandard)\Mono.Cecil.Mdb.pdb" /> From 5f32547a1a077140a7879f3835a192b904b3c865 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 12 Jun 2024 17:26:38 -0400 Subject: [PATCH 03/12] Update --- .../Xamarin.Android.Tools.BootstrapTasks.csproj | 1 + .../Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs | 2 ++ external/xamarin-android-tools | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj index d3ab591a159..8f3702c283a 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj @@ -18,6 +18,7 @@ + diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs index fbac9a49e21..05abe0041e8 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs @@ -3,6 +3,8 @@ using System.Text; using System.Diagnostics; +using Microsoft.Android.Build.Tasks; + using Microsoft.Build.Framework; using Microsoft.Build.Utilities; diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 02e2827c95b..f305cf1fc54 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 02e2827c95b3621e9e96de7136c10217b1a05dc3 +Subproject commit f305cf1fc548fd51845ba5084a795094a2d7a58f From c73374b348b29f3f89eed3eadb8289eb816d506e Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 12 Jun 2024 17:30:37 -0400 Subject: [PATCH 04/12] Bump monodroid --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 55ef65151ea..6e2fe33d4bc 100644 --- a/.external +++ b/.external @@ -1 +1 @@ -xamarin/monodroid:main@ae876c994e5902f429e0e5cf04e5918c82ecc762 +xamarin/monodroid:dev/pjc/at-asynctask@ddb73d1550baecd59bc1ef41b2299e4c2d496716 From 6b59938d18ae787e769f48487da170b0b04fe3a5 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 12 Jun 2024 18:41:23 -0400 Subject: [PATCH 05/12] Bump xat --- external/xamarin-android-tools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index f305cf1fc54..68db73b16c4 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit f305cf1fc548fd51845ba5084a795094a2d7a58f +Subproject commit 68db73b16c4d1051e7e1cc22638f220d52100397 From c6b81309611fc4f1982fc1773f8c477572d1926d Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Wed, 12 Jun 2024 18:42:25 -0400 Subject: [PATCH 06/12] Bump monodroid --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index 6e2fe33d4bc..bbf587acf3b 100644 --- a/.external +++ b/.external @@ -1 +1 @@ -xamarin/monodroid:dev/pjc/at-asynctask@ddb73d1550baecd59bc1ef41b2299e4c2d496716 +xamarin/monodroid:dev/pjc/at-asynctask@7bde2820c821471210d31d744a019994f59c0ef4 From c4347271cca2e8fea1704f374406d0b40240ecde Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 24 Jun 2024 18:36:38 -0400 Subject: [PATCH 07/12] AndroidAsyncTask -> AsyncTask --- src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs | 2 +- src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs | 2 +- .../Tasks/CalculateLayoutCodeBehind.cs | 2 +- src/Xamarin.Android.Build.Tasks/Tasks/CompileNativeAssembly.cs | 2 +- src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.cs | 2 +- .../Tasks/GenerateLibraryResources.cs | 2 +- src/Xamarin.Android.Build.Tasks/Tasks/GetAotArguments.cs | 2 +- .../Tasks/GetMicrosoftNuGetPackagesMap.cs | 2 +- .../Tasks/LinkApplicationSharedLibraries.cs | 2 +- src/Xamarin.Android.Build.Tasks/Tasks/MavenDownload.cs | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs index 87535f38721..216b3934b2b 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt.cs @@ -17,7 +17,7 @@ namespace Xamarin.Android.Tasks { - public class Aapt : AndroidAsyncTask + public class Aapt : AsyncTask { public override string TaskPrefix => "APT"; diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs index 148725a031b..97d631aa698 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/Aapt2.cs @@ -19,7 +19,7 @@ namespace Xamarin.Android.Tasks { - public abstract class Aapt2 : AndroidAsyncTask { + public abstract class Aapt2 : AsyncTask { private const int MAX_PATH = 260; private const int ASCII_MAX_CHAR = 127; diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CalculateLayoutCodeBehind.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CalculateLayoutCodeBehind.cs index 2d16b10fbf5..4ee204ad0ee 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/CalculateLayoutCodeBehind.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/CalculateLayoutCodeBehind.cs @@ -15,7 +15,7 @@ namespace Xamarin.Android.Tasks { - public class CalculateLayoutCodeBehind : AndroidAsyncTask + public class CalculateLayoutCodeBehind : AsyncTask { public override string TaskPrefix => "CLC"; diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/CompileNativeAssembly.cs b/src/Xamarin.Android.Build.Tasks/Tasks/CompileNativeAssembly.cs index b5d5a68a312..b8c112698f9 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/CompileNativeAssembly.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/CompileNativeAssembly.cs @@ -12,7 +12,7 @@ namespace Xamarin.Android.Tasks { - public class CompileNativeAssembly : AndroidAsyncTask + public class CompileNativeAssembly : AsyncTask { public override string TaskPrefix => "CNA"; diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.cs index d69d599f348..df14a51b426 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLayoutBindings.cs @@ -17,7 +17,7 @@ namespace Xamarin.Android.Tasks { // TODO: add doc comments to the generated properties // - public partial class GenerateLayoutBindings : AndroidAsyncTask + public partial class GenerateLayoutBindings : AsyncTask { public override string TaskPrefix => "GLB"; diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs index 8fc56372b18..feb5f081e31 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/GenerateLibraryResources.cs @@ -12,7 +12,7 @@ namespace Xamarin.Android.Tasks /// /// We used to invoke aapt/aapt2 per library (many times!), this task does the work to generate R.java for libraries without calling aapt/aapt2. /// - public partial class GenerateLibraryResources : AndroidAsyncTask + public partial class GenerateLibraryResources : AsyncTask { public override string TaskPrefix => "GLR"; diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GetAotArguments.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GetAotArguments.cs index b839175b2ed..af3fcf957cd 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/GetAotArguments.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/GetAotArguments.cs @@ -15,7 +15,7 @@ namespace Xamarin.Android.Tasks /// The task subclasses this in "legacy" Xamarin.Android. /// The task subclasses this in .NET 6+. /// - public abstract class GetAotArguments : AndroidAsyncTask + public abstract class GetAotArguments : AsyncTask { [Required] public string AndroidApiLevel { get; set; } = ""; diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/GetMicrosoftNuGetPackagesMap.cs b/src/Xamarin.Android.Build.Tasks/Tasks/GetMicrosoftNuGetPackagesMap.cs index d6a1557944d..03d42eeb7f3 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/GetMicrosoftNuGetPackagesMap.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/GetMicrosoftNuGetPackagesMap.cs @@ -11,7 +11,7 @@ namespace Xamarin.Android.Tasks; -public class GetMicrosoftNuGetPackagesMap : AndroidAsyncTask +public class GetMicrosoftNuGetPackagesMap : AsyncTask { static readonly HttpClient http_client = new HttpClient (); diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/LinkApplicationSharedLibraries.cs b/src/Xamarin.Android.Build.Tasks/Tasks/LinkApplicationSharedLibraries.cs index 4f3fa4d88b0..cddfbfb242a 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/LinkApplicationSharedLibraries.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/LinkApplicationSharedLibraries.cs @@ -13,7 +13,7 @@ namespace Xamarin.Android.Tasks { - public class LinkApplicationSharedLibraries : AndroidAsyncTask + public class LinkApplicationSharedLibraries : AsyncTask { public override string TaskPrefix => "LAS"; diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/MavenDownload.cs b/src/Xamarin.Android.Build.Tasks/Tasks/MavenDownload.cs index 383cc1a2d2f..3ac8d2383c1 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/MavenDownload.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/MavenDownload.cs @@ -15,7 +15,7 @@ namespace Xamarin.Android.Tasks; -public class MavenDownload : AndroidAsyncTask +public class MavenDownload : AsyncTask { public override string TaskPrefix => "MDT"; From e89294885e8ba5ca4a5b507dd47cb4851b59ede6 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 24 Jun 2024 20:21:38 -0400 Subject: [PATCH 08/12] AndroidAsyncTask -> AsyncTask --- Documentation/guides/MSBuildBestPractices.md | 2 +- .../xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/Sleep.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/guides/MSBuildBestPractices.md b/Documentation/guides/MSBuildBestPractices.md index 9bbcd187c2c..ecbad1089f6 100644 --- a/Documentation/guides/MSBuildBestPractices.md +++ b/Documentation/guides/MSBuildBestPractices.md @@ -612,7 +612,7 @@ public class MyTask : AndroidTask The benefit here is that if an unhandled exception is thrown, `MyTask` will automatically generate proper error codes. -`AndroidAsyncTask` has an additional override for doing work on a +`AsyncTask` has an additional override for doing work on a background thread: ```csharp diff --git a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/Sleep.cs b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/Sleep.cs index 37c04e189fa..bd1e4d7e446 100644 --- a/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/Sleep.cs +++ b/build-tools/xa-prep-tasks/Xamarin.Android.BuildTools.PrepTasks/Sleep.cs @@ -9,7 +9,7 @@ namespace Xamarin.Android.BuildTools.PrepTasks { - public class XASleepInternal : AndroidAsyncTask + public class XASleepInternal : AsyncTask { public override string TaskPrefix => "XASI"; public int Milliseconds { get; set; } From 1a2b3badffc577199a5156023e4b2b4f6479a0a2 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 25 Jun 2024 12:15:23 -0400 Subject: [PATCH 09/12] Fix RunParallelCmds --- .../Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs index 05abe0041e8..957facd9971 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks/RunParallelCmds.cs @@ -14,6 +14,8 @@ namespace Xamarin.Android.Tools.BootstrapTasks { public class RunParallelCmds : AsyncTask { + public override string TaskPrefix => "RPCMD"; + [Required] public ITaskItem[] Commands { get; set; } From ee2c248d46e59095568ab4c069b085f9e06f20b4 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 25 Jun 2024 15:37:59 -0400 Subject: [PATCH 10/12] Bump monodroid --- .external | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.external b/.external index bbf587acf3b..9dc42c078f0 100644 --- a/.external +++ b/.external @@ -1 +1 @@ -xamarin/monodroid:dev/pjc/at-asynctask@7bde2820c821471210d31d744a019994f59c0ef4 +xamarin/monodroid:dev/pjc/at-asynctask@a6789e0e94dc327cf2a336be156b3a9930f57868 From 3fb8367a9558975a15048163c9e7289a4c5fdc3b Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 1 Jul 2024 10:20:57 -0400 Subject: [PATCH 11/12] Bump dependencies --- .external | 2 +- external/xamarin-android-tools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.external b/.external index ae4b600c0b9..9df5cdff4f5 100644 --- a/.external +++ b/.external @@ -1 +1 @@ -xamarin/monodroid:main@e11d9a5af8f00a88d15bd87c777608f17c4ece78 +xamarin/monodroid:main@038240c52a7dc2e66b9ad2ddb20b9886836eaec9 diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 96745904ec3..3debf8e07ce 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 96745904ec3eeb71ccd178eeeab9a14afebfeb80 +Subproject commit 3debf8e07ce4a9dd4435d52913203eb93cc9df79 From cb2792027209f3b0d0649f9baac4bdf79f1ea790 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 1 Jul 2024 10:24:28 -0400 Subject: [PATCH 12/12] Formatting --- .../Xamarin.Android.Tools.BootstrapTasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj index 8f3702c283a..09905fa93ef 100644 --- a/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj +++ b/build-tools/Xamarin.Android.Tools.BootstrapTasks/Xamarin.Android.Tools.BootstrapTasks.csproj @@ -18,7 +18,7 @@ - +