From ab11fc1a627947177ae411cb6a2af9f591c280e2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 5 Dec 2022 07:05:00 -0500
Subject: [PATCH 1/2] Bump to xamarin/android-api-docs/main@2d3e40a (#7608)

Changes: https://github.com/xamarin/android-api-docs/compare/d7bb60c384ee37039aa993f6be338b5c64b3d2ad...2d3e40ac0243072e361c0044f2ae723e877e34b1

  * xamarin/android-api-docs@2d3e40ac0: Add FabricBot config. (xamarin/android-api-docs#46)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 external/android-api-docs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/android-api-docs b/external/android-api-docs
index d7bb60c384e..2d3e40ac024 160000
--- a/external/android-api-docs
+++ b/external/android-api-docs
@@ -1 +1 @@
-Subproject commit d7bb60c384ee37039aa993f6be338b5c64b3d2ad
+Subproject commit 2d3e40ac0243072e361c0044f2ae723e877e34b1

From b165bc86c0026b17d0aacb1c1fd81afe9a05c762 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Mon, 5 Dec 2022 08:22:53 -0600
Subject: [PATCH 2/2] Bump to Android 32.0.485 packs for .NET 6 (#7602)

Changes: https://github.com/xamarin/xamarin-android/compare/9bf238f0f3eb5436cf9f9236327c3315bfc6689e...619ab7a92a09825ecb274bf87d8086d2dbe63aea

Other changes:

* Update `AddNuGetSourcesForOlderTargetFrameworks`, to fix the `XamarinLegacySdk` test
* This allows the test to use the `dotnet6` feed when needed
---
 Configuration.props                                        | 2 +-
 .../Tests/Xamarin.Android.Build.Tests/XASdkTests.cs        | 2 +-
 .../Tests/Xamarin.ProjectTools/Common/DotNetStandard.cs    | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Configuration.props b/Configuration.props
index 9a0a0edb3d1..3c15d7e702a 100644
--- a/Configuration.props
+++ b/Configuration.props
@@ -48,7 +48,7 @@
     <Deterministic Condition=" '$(Deterministic)' == '' ">True</Deterministic>
     <LangVersion Condition=" '$(LangVersion)' == '' ">latest</LangVersion>
     <AndroidNet7Version Condition=" '$(AndroidNet7Version)' == '' ">33.0.1</AndroidNet7Version>
-    <AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.476</AndroidNet6Version>
+    <AndroidNet6Version Condition=" '$(AndroidNet6Version)' == '' ">32.0.485</AndroidNet6Version>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(HostOS)' == '' ">
     <HostOS Condition="$([MSBuild]::IsOSPlatform('windows'))">Windows</HostOS>
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
index d22ce8a4c94..68cb7728107 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/XASdkTests.cs
@@ -947,7 +947,7 @@ public void XamarinLegacySdk ([Values ("net6.0-android32.0", "net7.0-android33.0
 					}
 				}
 			};
-			proj.AddNuGetSourcesForOlderTargetFrameworks ();
+			proj.AddNuGetSourcesForOlderTargetFrameworks (dotnetTargetFramework);
 
 			using var b = new Builder ();
 			var legacyTargetFrameworkVersion = "13.0";
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetStandard.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetStandard.cs
index 2a061d81bc3..190b4119c95 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetStandard.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/DotNetStandard.cs
@@ -38,14 +38,15 @@ public string TargetFramework {
 		/// <summary>
 		/// Projects targeting net6.0/net7.0 require ref/runtime packs on NuGet.org or dotnet6/dotnet7
 		/// </summary>
-		public void AddNuGetSourcesForOlderTargetFrameworks ()
+		public void AddNuGetSourcesForOlderTargetFrameworks (string targetFramework = null)
 		{
-			if (TargetFramework.IndexOf ("net6.0", StringComparison.OrdinalIgnoreCase) != -1) {
+			targetFramework ??= TargetFramework;
+			if (targetFramework.IndexOf ("net6.0", StringComparison.OrdinalIgnoreCase) != -1) {
 				ExtraNuGetConfigSources = new List<string> {
 					"https://api.nuget.org/v3/index.json",
 					"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json",
 				};
-			} else if (TargetFramework.IndexOf ("net7.0", StringComparison.OrdinalIgnoreCase) != -1) {
+			} else if (targetFramework.IndexOf ("net7.0", StringComparison.OrdinalIgnoreCase) != -1) {
 				ExtraNuGetConfigSources = new List<string> {
 					"https://api.nuget.org/v3/index.json",
 					"https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json",