Merge branch 'main' into native-profiling-and-debugging

* main: Bump to Android 32.0.485 packs for .NET 6 (dotnet#7602) Bump to xamarin/android-api-docs@2d3e40a (dotnet#7608)
grendello · Dec 6, 2022 · ba0aaaa · ba0aaaa
2 parents 88c4e40 + b165bc8
commit ba0aaaa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git 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/external/android-api-docs b/external/android-api-docs
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
@@ -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
@@ -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",