[net7.0] Update dependencies from xamarin/xamarin-android (#9636)

* Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc1-92c290be2e02bb27e08c064190750f34c6a0cc6e-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.0-rc.1.125 -> To Version 33.0.0-rc.1.141

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.100-rc.1.22374.1 -> To Version 7.0.100-rc.2.22417.1 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc1-29a0fe0ebc671706e54c1637fe300310b95f15aa-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.0-rc.1.125 -> To Version 33.0.0-rc.1.142

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.100-rc.1.22374.1 -> To Version 7.0.100-rc.1.22423.7 (parent: Microsoft.Android.Sdk.Windows

* Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc1-fe619530aa3d959525ad8d4384c783c6d4846410-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.0-rc.1.125 -> To Version 33.0.0-rc.1.143

Dependency coherency updates

Microsoft.Dotnet.Sdk.Internal,Microsoft.NETCore.App.Ref,Microsoft.NET.Workload.Emscripten.Manifest-7.0.100
 From Version 7.0.100-rc.1.22374.1 -> To Version 7.0.100-rc.1.22423.7 (parent: Microsoft.Android.Sdk.Windows

* [net7.0] Update dependencies from xamarin/xamarin-macios (#9663)

Microsoft.iOS.Sdk , Microsoft.MacCatalyst.Sdk , Microsoft.macOS.Sdk , Microsoft.tvOS.Sdk
 From Version 15.4.1006-rc.1 -> To Version 15.4.1009-rc.1

* Ignore a new case of CS0809

Fixes:

    src/Core/src/Platform/Android/MauiAppCompatActivity.Lifecycle.cs(25,24):
    error CS0809: Obsolete member 'MauiAppCompatActivity.OnBackPressed()' overrides non-obsolete member 'Activity.OnBackPressed()'

It is apparently now a warning to override a non-obsolete method and
add `[Obsolete]`.

* Fix more CS0809 warnings

    Core/src/Android/Renderers/FormsWebViewClient.cs(30,24): error CS0809: Obsolete member 'FormsWebViewClient.ShouldOverrideUrlLoading(WebView, string)' overrides non-obsolete member 'WebViewClient.ShouldOverrideUrlLoading(WebView?, string?)'
    Core/src/Android/Renderers/FormsWebViewClient.cs(90,24): error CS0809: Obsolete member 'FormsWebViewClient.OnReceivedError(WebView, ClientError, string, string)' overrides non-obsolete member 'WebViewClient.OnReceivedError(WebView?, ClientError, string?, string?)'
    Core/src/Android/AppCompat/FormsAppCompatActivity.cs(73,24): error CS0809: Obsolete member 'FormsAppCompatActivity.OnBackPressed()' overrides non-obsolete member 'Activity.OnBackPressed()'

* Update dependencies from https://github.com/xamarin/xamarin-android build 7.0.1xx-rc1-2bf5153313128b4705c117dbdf9b83c04650c841-1

Microsoft.Android.Sdk.Windows
 From Version 33.0.0-rc.1.125 -> To Version 33.0.0-rc.1.144

Dependency coherency updates

Microsoft.NET.Workload.Emscripten.Manifest-7.0.100,Microsoft.NETCore.App.Ref,Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.0-rc.1.22362.2 -> To Version 7.0.0-rc.1.22411.1 (parent: Microsoft.NETCore.App.Ref

* Fixes for new runtime and emsdk workload names

* Only enable UseInterpreter for Android?

Context: dotnet/runtime#74628

Let's see if this gets past the errors on CI

* Bump to a newer .NET 6/MAUI build

Fixes this error on net6.0 test lanes:

    Microsoft.NET.Sdk.Razor.StaticWebAssets.targets(658,7): error : Manifest file at 'obj\Debug\net6.0-android\android-arm\staticwebassets.build.json' not found.
    Microsoft.NET.Sdk.Razor.StaticWebAssets.targets(658,7): error : Manifest file at 'obj\Debug\net6.0-android\android-x86\staticwebassets.build.json' not found.
    Microsoft.NET.Sdk.Razor.StaticWebAssets.targets(658,7): error : Manifest file at 'obj\Debug\net6.0-android\android-arm64\staticwebassets.build.json' not found.
    Microsoft.NET.Sdk.Razor.StaticWebAssets.targets(658,7): error : Manifest file at 'obj\Debug\net6.0-android\android-x64\staticwebassets.build.json' not found.

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: dotnet-maestro[bot] <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>

.nuspec/Microsoft.Maui.Controls.props

@@ -5,7 +5,8 @@
 	<PropertyGroup>
 		<_IsHotRestartDefined>$([System.Text.RegularExpressions.Regex]::IsMatch('$(DefineConstants.Trim())', '(^|;)HOTRESTART($|;)'))</_IsHotRestartDefined>
 		<DefineConstants Condition="!$(_IsHotRestartDefined) And '$(IsHotRestartBuild)' == 'true'">HOTRESTART;$(DefineConstants)</DefineConstants>
-		<UseInterpreter Condition="'$(UseInterpreter)' == '' and '$(Configuration)' == 'Debug'">True</UseInterpreter>
+		<!-- Only enabled on Android, see: https://github.com/dotnet/runtime/issues/74628 -->
+		<UseInterpreter Condition="'$(UseInterpreter)' == '' and '$(Configuration)' == 'Debug' and '$(TargetPlatformIdentifier)' == 'Android'">True</UseInterpreter>
 		<MtouchLink Condition="'$(MtouchLink)' == '' and '$(Configuration)' == 'Debug' and '$(UseInterpreter)' == 'true'">None</MtouchLink>
 	</PropertyGroup>
 

NuGet.config

@@ -20,6 +20,9 @@
     <add key="dotnet7" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet7/nuget/v3/index.json" />
     <add key="skiasharp" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/SkiaSharp/nuget/v3/index.json" />
     <add key="wasdk-internal" value="https://pkgs.dev.azure.com/microsoft/ProjectReunion/_packaging/Project.Reunion.nuget.internal/nuget/v3/index.json" />
+    <!-- Added manually for dotnet/runtime 6.0.9 -->
+    <add key="darc-pub-dotnet-emsdk-3f6c45a" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-3f6c45a2/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-531f715" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-531f715f/nuget/v3/index.json" />
   </packageSources>
   <activePackageSource>
     <add key="All" value="(Aggregate source)" />

eng/Version.Details.xml

@@ -1,36 +1,40 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22374.1" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.1.22424.4" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>53587f98e132f3c5bc6d2a77d779d6872710d53e</Sha>
+      <Sha>bcf1c82b2c5aa3a9bbfea49b62e214826e59fff2</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22367.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22423.16" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>aafa91036e1efd3d4dcb67eeb261cb6d8f774685</Sha>
+      <Sha>430c42acb0eb0481f58d1acb172af346363e2edc</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.0-rc.1.125">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.0-rc.1.144">
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
-      <Sha>caf6f3cd02fef236dbe7bd5a1dae5d073a3e40c5</Sha>
+      <Sha>2bf5153313128b4705c117dbdf9b83c04650c841</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.1006-rc.1">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.1009-rc.1">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>0e53b999d279ef18eb8c27fc72f596d002882365</Sha>
+      <Sha>3198941d450cfc98491cc71c322b1c86b3d6a5fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="15.4.1006-rc.1">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="15.4.1009-rc.1">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>0e53b999d279ef18eb8c27fc72f596d002882365</Sha>
+      <Sha>3198941d450cfc98491cc71c322b1c86b3d6a5fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.1006-rc.1">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.1009-rc.1">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>0e53b999d279ef18eb8c27fc72f596d002882365</Sha>
+      <Sha>3198941d450cfc98491cc71c322b1c86b3d6a5fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.1006-rc.1">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.1009-rc.1">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>0e53b999d279ef18eb8c27fc72f596d002882365</Sha>
+      <Sha>3198941d450cfc98491cc71c322b1c86b3d6a5fa</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.Manifest-7.0.100" Version="7.0.0-rc.1.22362.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22423.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>11a9acf5ab6fe5a20f0a7d4326c785bd51e9859c</Sha>
+      <Sha>321399ab3ab4853fbf861b2eaed2113447a6d7e4</Sha>
+    </Dependency>
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.1.22423.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+      <Uri>https://github.com/dotnet/emsdk</Uri>
+      <Sha>321399ab3ab4853fbf861b2eaed2113447a6d7e4</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>

eng/Versions.props

@@ -1,27 +1,27 @@
 <Project>
   <PropertyGroup>
     <!-- Current previous .NET SDK major version's stable release of MAUI packages -->
-    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.419</MicrosoftMauiPreviousDotNetReleasedVersion>
+    <MicrosoftMauiPreviousDotNetReleasedVersion>6.0.511</MicrosoftMauiPreviousDotNetReleasedVersion>
     <!-- dotnet/installer -->
-    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22374.1</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22424.4</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22367.4</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22423.16</MicrosoftNETCoreAppRefPackageVersion>
     <!-- NOTE: should eventually revert back to $(MicrosoftNETCoreAppRefPackageVersion) in .NET 7 -->
     <MicrosoftExtensionsPackageVersion>7.0.0-rc.1.22402.10</MicrosoftExtensionsPackageVersion>
     <MicrosoftExtensionsServicingPackageVersion>7.0.0-rc.1.22402.10</MicrosoftExtensionsServicingPackageVersion>
     <SystemCodeDomPackageVersion>6.0.0</SystemCodeDomPackageVersion>
     <!-- xamarin/xamarin-android -->
-    <MicrosoftAndroidSdkWindowsPackageVersion>33.0.0-rc.1.125</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>33.0.0-rc.1.144</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <MicrosoftiOSSdkPackageVersion>15.4.1006-rc.1</MicrosoftiOSSdkPackageVersion>
-    <MicrosoftMacCatalystSdkPackageVersion>15.4.1006-rc.1</MicrosoftMacCatalystSdkPackageVersion>
-    <MicrosoftmacOSSdkPackageVersion>12.3.1006-rc.1</MicrosoftmacOSSdkPackageVersion>
-    <MicrosofttvOSSdkPackageVersion>15.4.1006-rc.1</MicrosofttvOSSdkPackageVersion>
+    <MicrosoftiOSSdkPackageVersion>15.4.1009-rc.1</MicrosoftiOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.1009-rc.1</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.1009-rc.1</MicrosoftmacOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>15.4.1009-rc.1</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.100-rc.1.22</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->
-    <MicrosoftNETWorkloadEmscriptenManifest70100PackageVersion>7.0.0-rc.1.22362.2</MicrosoftNETWorkloadEmscriptenManifest70100PackageVersion>
-    <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptenManifest70100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
+    <MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0-rc.1.22423.3</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
+    <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
     <!-- wasdk -->
     <MicrosoftWindowsAppSDKPackageVersion>1.1.4</MicrosoftWindowsAppSDKPackageVersion>
     <MicrosoftWindowsSDKBuildToolsPackageVersion>10.0.22621.1</MicrosoftWindowsSDKBuildToolsPackageVersion>

src/Compatibility/Core/src/Android/AppCompat/FormsAppCompatActivity.cs

@@ -70,7 +70,9 @@ protected FormsAppCompatActivity()
 		public event EventHandler ConfigurationChanged;
 
 		[Obsolete]
+#pragma warning disable 809
 		public override void OnBackPressed()
+#pragma warning restore 809
 		{
 			if (BackPressed != null && BackPressed(this, EventArgs.Empty))
 				return;

src/Compatibility/Core/src/Android/Renderers/FormsWebViewClient.cs

@@ -27,8 +27,9 @@ protected FormsWebViewClient(IntPtr javaReference, JniHandleOwnership transfer)
 		[Obsolete("ShouldOverrideUrlLoading(view,url) is obsolete as of version 4.0.0. This method was deprecated in API level 24.")]
 		[EditorBrowsable(EditorBrowsableState.Never)]
 		// api 19-23
-		public override bool ShouldOverrideUrlLoading(WView view, string url)
-			=> SendNavigatingCanceled(url);
+#pragma warning disable 809
+		public override bool ShouldOverrideUrlLoading(WView view, string url) => SendNavigatingCanceled(url);
+#pragma warning restore 809
 
 		[PortHandler]
 		// api 24+
@@ -87,7 +88,9 @@ public override void OnPageFinished(WView view, string url)
 
 		[Obsolete("OnReceivedError is obsolete as of version 2.3.0. This method was deprecated in API level 23.")]
 		[EditorBrowsable(EditorBrowsableState.Never)]
+#pragma warning disable 809
 		public override void OnReceivedError(WView view, ClientError errorCode, string description, string failingUrl)
+#pragma warning restore 809
 		{
 			if (failingUrl == _renderer?.Control.Url)
 			{

src/Core/src/Platform/Android/MauiAppCompatActivity.Lifecycle.cs

@@ -22,7 +22,9 @@ protected override void OnActivityResult(int requestCode, Result resultCode, Int
 		// TODO: Investigate whether the new AndroidX way is actually useful:
 		//       https://developer.android.com/reference/android/app/Activity#onBackPressed()
 		[Obsolete]
+#pragma warning disable 809
 		public override void OnBackPressed()
+#pragma warning restore 809
 		{
 			var preventBackPropagation = false;
 			MauiApplication.Current?.Services?.InvokeLifecycleEvents<AndroidLifecycle.OnBackPressed>(del =>

src/DotNet/Dependencies/Workloads.csproj

@@ -3,8 +3,10 @@
     <TargetFramework>netstandard2.0</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
-    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.Manifest-$(DotNetMonoManifestVersionBand)"   Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
-    <PackageDownload Include="Microsoft.NET.Workload.Emscripten.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net6.Manifest-$(DotNetMonoManifestVersionBand)"   Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Workload.Mono.ToolChain.net7.Manifest-$(DotNetMonoManifestVersionBand)"   Version="[$(MicrosoftNETCoreAppRefPackageVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Workload.Emscripten.net6.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
+    <PackageDownload Include="Microsoft.NET.Workload.Emscripten.net7.Manifest-$(DotNetEmscriptenManifestVersionBand)" Version="[$(MicrosoftNETWorkloadEmscriptenPackageVersion)]" />
     <PackageDownload Include="Microsoft.NET.Sdk.Android.Manifest-$(DotNetAndroidManifestVersionBand)"    Version="[$(MicrosoftAndroidSdkWindowsPackageVersion)]" />
     <PackageDownload Include="Microsoft.NET.Sdk.MacCatalyst.Manifest-$(DotNetMaciOSManifestVersionBand)" Version="[$(MicrosoftMacCatalystSdkPackageVersion)]" />
     <PackageDownload Include="Microsoft.NET.Sdk.iOS.Manifest-$(DotNetMaciOSManifestVersionBand)"         Version="[$(MicrosoftiOSSdkPackageVersion)]" />