From 4be7d24d32f5b82349554b87b9a7df27f2f2cf09 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Tue, 24 Jan 2023 22:04:42 +0000
Subject: [PATCH 1/4] Update dependencies from
 https://github.com/xamarin/xamarin-android build
 main-953cd1939d309e0affe610728a79ede865a3bb75-1

Microsoft.Android.Sdk.Windows
 From Version 34.0.0-preview.1.127 -> To Version 34.0.0-preview.1.129
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index dfd1defedb54..3dc9eb8df510 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -8,9 +8,9 @@
       <Uri>https://github.com/dotnet/runtime</Uri>
       <Sha>5da4a9e919dcee35f831ab69b6e475baaf798875</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-preview.1.127">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="34.0.0-preview.1.129">
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
-      <Sha>c1efcb5678c8d93c4d5bdd0452a79a8ffab2f6b7</Sha>
+      <Sha>953cd1939d309e0affe610728a79ede865a3bb75</Sha>
     </Dependency>
     <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="16.2.126-net8-p1">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index c34716b4021f..d75f20b329a9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -11,7 +11,7 @@
     <MicrosoftExtensionsServicingPackageVersion>7.0.0</MicrosoftExtensionsServicingPackageVersion>
     <SystemCodeDomPackageVersion>7.0.0</SystemCodeDomPackageVersion>
     <!-- xamarin/xamarin-android -->
-    <MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-preview.1.127</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>34.0.0-preview.1.129</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
     <MicrosoftMacCatalystSdkPackageVersion>16.2.126-net8-p1</MicrosoftMacCatalystSdkPackageVersion>
     <MicrosoftmacOSSdkPackageVersion>13.1.126-net8-p1</MicrosoftmacOSSdkPackageVersion>

From f9496574b585e8a31195b97f52fa271eebcd1e79 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Tue, 24 Jan 2023 16:14:30 -0600
Subject: [PATCH 2/4] [android] set `$(AndroidGenerateResourceDesigner)`

Context: https://github.com/xamarin/xamarin-android/commit/953cd1939d309e0affe610728a79ede865a3bb75

By setting `$(AndroidGenerateResourceDesigner)` appropriately, we can
avoid some of the public APIs that appeared in eea6fea.

It is turned off repo-wide, and only enabled in `Core.csproj` and
`Compatibility.csproj`. These two projects use `@(AndroidResource)`
files, so they require this.
---
 Directory.Build.targets                                   | 8 ++++++++
 .../Maui/PublicAPI/net-android/PublicAPI.Unshipped.txt    | 2 --
 src/Compatibility/Core/src/Compatibility.csproj           | 1 +
 .../src/PublicAPI/net-android/PublicAPI.Unshipped.txt     | 2 --
 .../Xaml/PublicAPI/net-android/PublicAPI.Unshipped.txt    | 2 --
 .../src/PublicAPI/net-android/PublicAPI.Unshipped.txt     | 2 --
 src/Core/src/Core.csproj                                  | 1 +
 .../DeviceTests.Shared/Core.DeviceTests.Shared.csproj     | 2 --
 .../src/PublicAPI/net-android/PublicAPI.Unshipped.txt     | 2 --
 .../PublicAPI/net-android/PublicAPI.Unshipped.txt         | 2 --
 .../PublicAPI/net-android/PublicAPI.Unshipped.txt         | 2 --
 11 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index 9abbbf7d4d53..b0a32df43854 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -54,6 +54,14 @@
     <TargetPlatformMinVersion>10.0.17763.0</TargetPlatformMinVersion>
   </PropertyGroup>
 
+<!--
+    Disable generation of obj/Debug/net8.0-android/__Microsoft.Android.Resource.Designer.cs
+    Enable this individually in projects that declare/use AndroidResource IDs.
+  -->
+  <PropertyGroup Condition="'$(_MauiTargetPlatformIsAndroid)' == 'True' AND '$(AndroidApplication)' != 'true'">
+    <AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
+  </PropertyGroup>
+
   <!-- semi HACK: by default, WinUI includes all @(None) with .bmp/.png as @(Content) and adds that to the .pri -->
   <ItemGroup Condition="'$(_MauiTargetPlatformIsWindows)' == 'True'">
     <Content Remove="@(None->WithMetadataValue('Pack','true'))" />
diff --git a/src/BlazorWebView/src/Maui/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/BlazorWebView/src/Maui/PublicAPI/net-android/PublicAPI.Unshipped.txt
index f42a7a199d08..0ba16b44f84b 100644
--- a/src/BlazorWebView/src/Maui/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/BlazorWebView/src/Maui/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -3,6 +3,4 @@ Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebView.StartPath.get -> stri
 Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebView.StartPath.set -> void
 Microsoft.AspNetCore.Components.WebView.Maui.IBlazorWebView.StartPath.get -> string!
 Microsoft.AspNetCore.Components.WebView.Maui.IBlazorWebView.StartPath.set -> void
-Microsoft.AspNetCore.Components.WebView.Maui.Resource
-Microsoft.AspNetCore.Components.WebView.Maui.Resource.Resource() -> void
 static readonly Microsoft.AspNetCore.Components.WebView.Maui.BlazorWebView.StartPathProperty -> Microsoft.Maui.Controls.BindableProperty!
diff --git a/src/Compatibility/Core/src/Compatibility.csproj b/src/Compatibility/Core/src/Compatibility.csproj
index 84fd504f6897..1ba5b34fec46 100644
--- a/src/Compatibility/Core/src/Compatibility.csproj
+++ b/src/Compatibility/Core/src/Compatibility.csproj
@@ -10,6 +10,7 @@
     <TizenRoot>Tizen\</TizenRoot>
     <IsPackable>false</IsPackable>
     <IsTrimmable Condition=" !$(TargetFramework.StartsWith('netstandard')) ">true</IsTrimmable>
+    <AndroidGenerateResourceDesigner>true</AndroidGenerateResourceDesigner>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
diff --git a/src/Controls/Maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/Maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index b72069e0f6db..7dc5c58110bf 100644
--- a/src/Controls/Maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/Maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,3 +1 @@
 #nullable enable
-Microsoft.Maui.Controls.Maps.Resource
-Microsoft.Maui.Controls.Maps.Resource.Resource() -> void
diff --git a/src/Controls/src/Xaml/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Controls/src/Xaml/PublicAPI/net-android/PublicAPI.Unshipped.txt
index b292ce61ab5b..7dc5c58110bf 100644
--- a/src/Controls/src/Xaml/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Controls/src/Xaml/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,3 +1 @@
 #nullable enable
-Microsoft.Maui.Controls.Xaml.Resource
-Microsoft.Maui.Controls.Xaml.Resource.Resource() -> void
diff --git a/src/Core/maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Core/maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 3480c3445e07..7dc5c58110bf 100644
--- a/src/Core/maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Core/maps/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,3 +1 @@
 #nullable enable
-Microsoft.Maui.Maps.Resource
-Microsoft.Maui.Maps.Resource.Resource() -> void
diff --git a/src/Core/src/Core.csproj b/src/Core/src/Core.csproj
index 98c4f3987089..5a30d4e31be7 100644
--- a/src/Core/src/Core.csproj
+++ b/src/Core/src/Core.csproj
@@ -6,6 +6,7 @@
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <IsTrimmable>false</IsTrimmable>
+    <AndroidGenerateResourceDesigner>true</AndroidGenerateResourceDesigner>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591;RS0041;RS0026;RS0027</NoWarn>
   </PropertyGroup>
diff --git a/src/Core/tests/DeviceTests.Shared/Core.DeviceTests.Shared.csproj b/src/Core/tests/DeviceTests.Shared/Core.DeviceTests.Shared.csproj
index e59e89980236..72fbfe71ffaf 100644
--- a/src/Core/tests/DeviceTests.Shared/Core.DeviceTests.Shared.csproj
+++ b/src/Core/tests/DeviceTests.Shared/Core.DeviceTests.Shared.csproj
@@ -5,8 +5,6 @@
     <SingleProject>true</SingleProject>
     <RootNamespace>Microsoft.Maui.DeviceTests</RootNamespace>
     <AssemblyName>Microsoft.Maui.DeviceTests.Shared</AssemblyName>
-    <!-- Avoids conflict in Controls.DeviceTests.csproj -->
-    <AndroidResgenNamespace>Microsoft.Maui.DeviceTests.Shared</AndroidResgenNamespace>
     <!--<Nullable>enable</Nullable>-->
     <NoWarn>$(NoWarn),CA1416</NoWarn>
   </PropertyGroup>
diff --git a/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 4e35dc5bcd05..1e2c3171b21e 100644
--- a/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Essentials/src/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -1,7 +1,5 @@
 #nullable enable
 *REMOVED*Microsoft.Maui.Storage.ISecureStorage.GetAsync(string! key) -> System.Threading.Tasks.Task<string!>!
 *REMOVED*static Microsoft.Maui.Storage.SecureStorage.GetAsync(string! key) -> System.Threading.Tasks.Task<string!>!
-Microsoft.Maui.Essentials.Resource
-Microsoft.Maui.Essentials.Resource.Resource() -> void
 Microsoft.Maui.Storage.ISecureStorage.GetAsync(string! key) -> System.Threading.Tasks.Task<string?>!
 static Microsoft.Maui.Storage.SecureStorage.GetAsync(string! key) -> System.Threading.Tasks.Task<string?>!
diff --git a/src/Graphics/src/Graphics.Skia/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Graphics/src/Graphics.Skia/PublicAPI/net-android/PublicAPI.Unshipped.txt
index e24e28764a36..ab7280577050 100644
--- a/src/Graphics/src/Graphics.Skia/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Graphics/src/Graphics.Skia/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -2,8 +2,6 @@
 Microsoft.Maui.Graphics.Skia.FontExtensions
 Microsoft.Maui.Graphics.Skia.PlatformBitmapExportService
 Microsoft.Maui.Graphics.Skia.PlatformBitmapExportService.PlatformBitmapExportService() -> void
-Microsoft.Maui.Graphics.Skia.Resource
-Microsoft.Maui.Graphics.Skia.Resource.Resource() -> void
 Microsoft.Maui.Graphics.Skia.SKColorExtensions
 Microsoft.Maui.Graphics.Skia.SKGraphicsExtensions
 Microsoft.Maui.Graphics.Skia.SkiaBitmapExportContext
diff --git a/src/Graphics/src/Graphics/PublicAPI/net-android/PublicAPI.Unshipped.txt b/src/Graphics/src/Graphics/PublicAPI/net-android/PublicAPI.Unshipped.txt
index 6502641389af..d7ee0ca3d13c 100644
--- a/src/Graphics/src/Graphics/PublicAPI/net-android/PublicAPI.Unshipped.txt
+++ b/src/Graphics/src/Graphics/PublicAPI/net-android/PublicAPI.Unshipped.txt
@@ -626,8 +626,6 @@ Microsoft.Maui.Graphics.ResizeMode
 Microsoft.Maui.Graphics.ResizeMode.Bleed = 1 -> Microsoft.Maui.Graphics.ResizeMode
 Microsoft.Maui.Graphics.ResizeMode.Fit = 0 -> Microsoft.Maui.Graphics.ResizeMode
 Microsoft.Maui.Graphics.ResizeMode.Stretch = 2 -> Microsoft.Maui.Graphics.ResizeMode
-Microsoft.Maui.Graphics.Resource
-Microsoft.Maui.Graphics.Resource.Resource() -> void
 Microsoft.Maui.Graphics.ScalingCanvas
 Microsoft.Maui.Graphics.ScalingCanvas.Alpha.set -> void
 Microsoft.Maui.Graphics.ScalingCanvas.Antialias.set -> void

From 069759f20fda69a3c3894c4f93d55ba65e98572a Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Tue, 24 Jan 2023 16:56:48 -0600
Subject: [PATCH 3/4] Use $(MauiGenerateResourceDesigner) name instead

MSBuild ordering was breaking the settings here.

The Android workload defaults $(AndroidGenerateResourceDesigner) to true, but we need to know if it was set in individual .csproj files.

Invented a new property name for this.
---
 Directory.Build.targets                         | 2 +-
 src/Compatibility/Core/src/Compatibility.csproj | 2 +-
 src/Core/src/Core.csproj                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Directory.Build.targets b/Directory.Build.targets
index b0a32df43854..65470a9b9367 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -58,7 +58,7 @@
     Disable generation of obj/Debug/net8.0-android/__Microsoft.Android.Resource.Designer.cs
     Enable this individually in projects that declare/use AndroidResource IDs.
   -->
-  <PropertyGroup Condition="'$(_MauiTargetPlatformIsAndroid)' == 'True' AND '$(AndroidApplication)' != 'true'">
+  <PropertyGroup Condition="'$(_MauiTargetPlatformIsAndroid)' == 'True' AND '$(AndroidApplication)' != 'true' AND '$(MauiGenerateResourceDesigner)' != 'true'">
     <AndroidGenerateResourceDesigner>false</AndroidGenerateResourceDesigner>
   </PropertyGroup>
 
diff --git a/src/Compatibility/Core/src/Compatibility.csproj b/src/Compatibility/Core/src/Compatibility.csproj
index 1ba5b34fec46..1bed9d1a8ea9 100644
--- a/src/Compatibility/Core/src/Compatibility.csproj
+++ b/src/Compatibility/Core/src/Compatibility.csproj
@@ -10,7 +10,7 @@
     <TizenRoot>Tizen\</TizenRoot>
     <IsPackable>false</IsPackable>
     <IsTrimmable Condition=" !$(TargetFramework.StartsWith('netstandard')) ">true</IsTrimmable>
-    <AndroidGenerateResourceDesigner>true</AndroidGenerateResourceDesigner>
+    <MauiGenerateResourceDesigner>true</MauiGenerateResourceDesigner>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591</NoWarn>
   </PropertyGroup>
diff --git a/src/Core/src/Core.csproj b/src/Core/src/Core.csproj
index 5a30d4e31be7..1896848ebb7b 100644
--- a/src/Core/src/Core.csproj
+++ b/src/Core/src/Core.csproj
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <IsTrimmable>false</IsTrimmable>
-    <AndroidGenerateResourceDesigner>true</AndroidGenerateResourceDesigner>
+    <MauiGenerateResourceDesigner>true</MauiGenerateResourceDesigner>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591;RS0041;RS0026;RS0027</NoWarn>
   </PropertyGroup>

From 36170d63a4c499b3cd17bcf2fdb2d35a676897db Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 25 Jan 2023 08:36:49 -0600
Subject: [PATCH 4/4] Missed a project

---
 src/Controls/src/Core/Controls.Core.csproj | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Controls/src/Core/Controls.Core.csproj b/src/Controls/src/Core/Controls.Core.csproj
index ccd3f5ed2819..aeb6d61141ed 100644
--- a/src/Controls/src/Core/Controls.Core.csproj
+++ b/src/Controls/src/Core/Controls.Core.csproj
@@ -8,6 +8,7 @@
     <IsTrimmable>false</IsTrimmable>
     <_MauiDesignDllBuild Condition=" '$(OS)' != 'Unix' ">True</_MauiDesignDllBuild>
     <GitInfoReportImportance>high</GitInfoReportImportance>
+    <MauiGenerateResourceDesigner>true</MauiGenerateResourceDesigner>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);CS1591;RS0041;RS0026;RS0027;RS0022</NoWarn>
     <NoWarn Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'tizen' or $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'windows'">$(NoWarn);CA1420</NoWarn>