From 5e2b1723b1635385e8f86eb95b5da3983b0eca2d Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 22 Feb 2024 11:05:40 +0100 Subject: [PATCH 1/4] Add a property required by #8478 Context: https://github.com/xamarin/xamarin-android/pull/8478 Context: https://github.com/xamarin/monodroid/pull/1393 Merging this no-op change will make it easier to orchestrate merging of the two PRs above. It allows us to merge the `monodroid` one before merging #8478 and prevents breaking of any other builds or PRs in between merging of the two PRs. --- src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs index 0a15a2b8a26..7c0a3c01741 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs @@ -33,6 +33,9 @@ public class BuildApk : AndroidTask [Required] public string ApkOutputPath { get; set; } + [Required] + public string AppSharedLibrariesDir { get; set; } + [Required] public ITaskItem[] ResolvedUserAssemblies { get; set; } From 678a74f2f88e7dcf057033c1fc4fed97c42fee6e Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 22 Feb 2024 11:17:24 +0100 Subject: [PATCH 2/4] Don't require it yet --- src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs index 7c0a3c01741..c99ce0db5c5 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs @@ -33,7 +33,6 @@ public class BuildApk : AndroidTask [Required] public string ApkOutputPath { get; set; } - [Required] public string AppSharedLibrariesDir { get; set; } [Required] From 4b7486b95f0e6cbd6fa30b7b20a47fccd830c788 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 22 Feb 2024 11:47:34 +0100 Subject: [PATCH 3/4] Dummy change to kick-off the build --- src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs index c99ce0db5c5..0c8f65ae913 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs @@ -33,7 +33,7 @@ public class BuildApk : AndroidTask [Required] public string ApkOutputPath { get; set; } - public string AppSharedLibrariesDir { get; set; } + public string AppSharedLibrariesDir { get; set; } [Required] public ITaskItem[] ResolvedUserAssemblies { get; set; } From e9902438a6c4c2008161b8176b992649d5fa3b1a Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 22 Feb 2024 11:47:56 +0100 Subject: [PATCH 4/4] Undo the former change --- src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs index 0c8f65ae913..c99ce0db5c5 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/BuildApk.cs @@ -33,7 +33,7 @@ public class BuildApk : AndroidTask [Required] public string ApkOutputPath { get; set; } - public string AppSharedLibrariesDir { get; set; } + public string AppSharedLibrariesDir { get; set; } [Required] public ITaskItem[] ResolvedUserAssemblies { get; set; }