From c783bad93cf7f446aa3fe7efa60cc971d43196ce Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 31 Aug 2022 21:02:44 +0200
Subject: [PATCH] [net7.0] Update dependencies from xamarin/xamarin-android
 (#9821)

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

Microsoft.Android.Sdk.Windows
 From Version 33.0.0-rc.1.150 -> To Version 33.0.0-rc.1.151

* Update dependencies from https://github.com/xamarin/xamarin-macios build 20220831.5 (#9820)

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

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>

* Bump directly to a newer dotnet/runtime

Adjusted the parent dependency of:

    <Dependency Name="Microsoft.NETCore.App.Ref" CoherentParentDependency="Microsoft.Android.Sdk.Windows">

Then I ran:

    darc update-dependencies --coherency-only

* Revert "Only enable UseInterpreter for Android?"

This reverts commit 659e8d5eb21a10b7332b974d80bf35f3e845e137.

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 |  3 +--
 eng/Version.Details.xml               | 32 +++++++++++++--------------
 eng/Versions.props                    | 14 ++++++------
 3 files changed, 24 insertions(+), 25 deletions(-)

diff --git a/.nuspec/Microsoft.Maui.Controls.props b/.nuspec/Microsoft.Maui.Controls.props
index 785e1b515d00..79ed0e9a0e40 100644
--- a/.nuspec/Microsoft.Maui.Controls.props
+++ b/.nuspec/Microsoft.Maui.Controls.props
@@ -5,8 +5,7 @@
 	<PropertyGroup>
 		<_IsHotRestartDefined>$([System.Text.RegularExpressions.Regex]::IsMatch('$(DefineConstants.Trim())', '(^|;)HOTRESTART($|;)'))</_IsHotRestartDefined>
 		<DefineConstants Condition="!$(_IsHotRestartDefined) And '$(IsHotRestartBuild)' == 'true'">HOTRESTART;$(DefineConstants)</DefineConstants>
-		<!-- Only enabled on Android, see: https://github.com/dotnet/runtime/issues/74628 -->
-		<UseInterpreter Condition="'$(UseInterpreter)' == '' and '$(Configuration)' == 'Debug' and '$(TargetPlatformIdentifier)' == 'Android'">True</UseInterpreter>
+		<UseInterpreter Condition="'$(UseInterpreter)' == '' and '$(Configuration)' == 'Debug'">True</UseInterpreter>
 		<MtouchLink Condition="'$(MtouchLink)' == '' and '$(Configuration)' == 'Debug' and '$(UseInterpreter)' == 'true'">None</MtouchLink>
 	</PropertyGroup>
 
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7399d812e21d..bea3129f01f0 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -4,37 +4,37 @@
       <Uri>https://github.com/dotnet/installer</Uri>
       <Sha>cd7df40ff129744cc664ea5c83c113ccf2763829</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22423.16" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="7.0.0-rc.1.22426.10" CoherentParentDependency="Microsoft.Android.Sdk.Windows">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>430c42acb0eb0481f58d1acb172af346363e2edc</Sha>
+      <Sha>06aceb7015f3bd2ff019ef5920d2354eb2ea2c92</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.0-rc.1.150">
+    <Dependency Name="Microsoft.Android.Sdk.Windows" Version="33.0.0-rc.1.151">
       <Uri>https://github.com/xamarin/xamarin-android</Uri>
-      <Sha>ad187d8f158e1dfe903daae2e5b2c1607f7571ac</Sha>
+      <Sha>b9389dc0168e184758c226962a0b270d300c17eb</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.1009-rc.1">
+    <Dependency Name="Microsoft.MacCatalyst.Sdk" Version="15.4.1024-rc.1">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>3198941d450cfc98491cc71c322b1c86b3d6a5fa</Sha>
+      <Sha>fca8b10f73d022d649b8985f046fb927adbdedac</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.iOS.Sdk" Version="15.4.1009-rc.1">
+    <Dependency Name="Microsoft.iOS.Sdk" Version="15.4.1024-rc.1">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>3198941d450cfc98491cc71c322b1c86b3d6a5fa</Sha>
+      <Sha>fca8b10f73d022d649b8985f046fb927adbdedac</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.1009-rc.1">
+    <Dependency Name="Microsoft.tvOS.Sdk" Version="15.4.1024-rc.1">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>3198941d450cfc98491cc71c322b1c86b3d6a5fa</Sha>
+      <Sha>fca8b10f73d022d649b8985f046fb927adbdedac</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.1009-rc.1">
+    <Dependency Name="Microsoft.macOS.Sdk" Version="12.3.1024-rc.1">
       <Uri>https://github.com/xamarin/xamarin-macios</Uri>
-      <Sha>3198941d450cfc98491cc71c322b1c86b3d6a5fa</Sha>
+      <Sha>fca8b10f73d022d649b8985f046fb927adbdedac</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22423.3" CoherentParentDependency="Microsoft.NETCore.App.Ref">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net6.Manifest-7.0.100" Version="7.0.0-rc.1.22424.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>321399ab3ab4853fbf861b2eaed2113447a6d7e4</Sha>
+      <Sha>5ef661392ae7b1595b683df83d63e3a0365fc126</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">
+    <Dependency Name="Microsoft.NET.Workload.Emscripten.net7.Manifest-7.0.100" Version="7.0.0-rc.1.22424.1" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
-      <Sha>321399ab3ab4853fbf861b2eaed2113447a6d7e4</Sha>
+      <Sha>5ef661392ae7b1595b683df83d63e3a0365fc126</Sha>
     </Dependency>
     <Dependency Name="Microsoft.WindowsAppSDK" Version="0.0.1">
       <Uri>https://dev.azure.com/microsoft/ProjectReunion/_git/ProjectReunionInternal</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 7aa9cb42b16b..bc537687ab70 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -5,22 +5,22 @@
     <!-- dotnet/installer -->
     <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.1.22425.9</MicrosoftDotnetSdkInternalPackageVersion>
     <!-- dotnet/runtime -->
-    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22423.16</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.1.22426.10</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.150</MicrosoftAndroidSdkWindowsPackageVersion>
+    <MicrosoftAndroidSdkWindowsPackageVersion>33.0.0-rc.1.151</MicrosoftAndroidSdkWindowsPackageVersion>
     <!-- xamarin/xamarin-macios -->
-    <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>
+    <MicrosoftiOSSdkPackageVersion>15.4.1024-rc.1</MicrosoftiOSSdkPackageVersion>
+    <MicrosoftMacCatalystSdkPackageVersion>15.4.1024-rc.1</MicrosoftMacCatalystSdkPackageVersion>
+    <MicrosoftmacOSSdkPackageVersion>12.3.1024-rc.1</MicrosoftmacOSSdkPackageVersion>
+    <MicrosofttvOSSdkPackageVersion>15.4.1024-rc.1</MicrosofttvOSSdkPackageVersion>
     <!-- Samsung/Tizen.NET -->
     <SamsungTizenSdkPackageVersion>7.0.100-rc.1.22</SamsungTizenSdkPackageVersion>
     <!-- emsdk -->
-    <MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0-rc.1.22423.3</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
+    <MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>7.0.0-rc.1.22424.1</MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion>
     <MicrosoftNETWorkloadEmscriptenPackageVersion>$(MicrosoftNETWorkloadEmscriptennet7Manifest70100PackageVersion)</MicrosoftNETWorkloadEmscriptenPackageVersion>
     <!-- wasdk -->
     <MicrosoftWindowsAppSDKPackageVersion>1.1.4</MicrosoftWindowsAppSDKPackageVersion>