From 34ffb898c21b0616b71b1d9ab524ebdde219275e Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Tue, 2 Aug 2022 13:06:19 -0500
Subject: [PATCH 1/2] Bump `$(AndroidNet6Version)` to 32.0.447 (#7224)

Context: https://www.nuget.org/packages/Microsoft.NET.Sdk.Android.Manifest-6.0.400/32.0.447

We shipped newer .NET 6 packs, so we can use them in our .NET 7 workload.

We can also remove the workaround for `Microsoft.NETCore.App`, because
the .NET 7 SDK now ships dotnet/runtime 6.0.7.
---
 Configuration.props                                         | 2 +-
 .../Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets   | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/Configuration.props b/Configuration.props
index ebc12657958..6d4d899fe4c 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -47,7 +47,7 @@
     <DebugType Condition=" '$(DebugType)' == '' ">portable</DebugType>
     <Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
     <LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
-    <AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.415</AndroidNet6Version>
+    <AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.447</AndroidNet6Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(HostOS)' == '' ">
     <HostOS Condition="$([MSBuild]::IsOSPlatform('windows'))">Windows</HostOS>
diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets
index a74dcf2eea6..be847040325 100644
--- a/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets
+++ b/src/Xamarin.Android.Build.Tasks/Microsoft.NET.Sdk.Android/WorkloadManifest.in.targets
@@ -12,12 +12,6 @@
         LatestRuntimeFrameworkVersion="@NET6_VERSION@"
         TargetingPackVersion="@NET6_VERSION@"
     />
-    <!--
-      HACK:
-      The .NET 7 SDK specifies 6.0.3 for .NET 6, but our .NET 6 libmonodroid.so depends on 6.0.5.
-      We should be able to remove this when we get a newer .NET 7 SDK.
-     -->
-    <KnownRuntimePack Update="Microsoft.NETCore.App" LatestRuntimeFrameworkVersion="6.0.5" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETCoreApp' and $([MSBuild]::VersionGreaterThanOrEquals($(TargetFrameworkVersion), '6.0')) ">

From 3e4686cf47cd65fb51df0dc744bc092dd321cbe9 Mon Sep 17 00:00:00 2001
From: Jonathan Pobst <jonathan.pobst@microsoft.com>
Date: Tue, 2 Aug 2022 14:01:55 -0500
Subject: [PATCH 2/2] Bump to xamarin/java.interop@a5756ca8. (#7226)

---
 external/Java.Interop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/Java.Interop b/external/Java.Interop
index 032f1e7160c..a5756ca8b87 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 032f1e7160c23a78e5b37208542f763e29992067
+Subproject commit a5756ca8b8764c24cc169e40a473f79302b40ca9