From ae2461434c3334b360491eb7724b62454dc040c1 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 23 Aug 2023 09:17:18 -0500
Subject: [PATCH] Bump to dotnet/installer/release/8.0.1xx-rc1 (#8279)

Changes: https://github.com/dotnet/installer/compare/684771d03c...85170c1c70

Updates: Microsoft.Dotnet.Sdk.Internal: from 8.0.100-rc.1.23417.5 to 8.0.100-rc.1.23422.1

Other changes:

* Feeds for dotnet/runtime 7.0.11

* Feeds for dotnet/runtime 6.0.22

* Bump to xamarin/java.interop/release/8.0.1xx-rc1@1c715a50

Changes: https://github.com/xamarin/java.interop/compare/5adb4d48...1c715a50

* Bump to xamarin/xamarin-android-tools/release/8.0.1xx-rc1@2b8ac126

Changes: https://github.com/xamarin/xamarin-android-tools/compare/52f0866c...2b8ac126

* Bump to xamarin/monodroid/release/8.0.1xx-rc1@release/8.0.1xx-rc1@6e57bd3e

* Set `$(DisableTransitiveFrameworkReferenceDownloads)` in tests

Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
---
 .external                                                | 2 +-
 NuGet.config                                             | 9 ++++++---
 eng/Version.Details.xml                                  | 4 ++--
 eng/Versions.props                                       | 2 +-
 external/Java.Interop                                    | 2 +-
 external/xamarin-android-tools                           | 2 +-
 .../Tests/Xamarin.ProjectTools/Common/XamarinProject.cs  | 1 +
 7 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.external b/.external
index 7c301a59843..37623a8713d 100644
--- a/.external
+++ b/.external
@@ -1,2 +1,2 @@
-xamarin/monodroid:main@057b17fe491f51823eb814f0163bb92686e24991
+xamarin/monodroid:release/8.0.1xx-rc1@6e57bd3ec72330e20d59380717b09e56322d2ef8
 mono/mono:2020-02@6dd9def57ce969ca04a0ecd9ef72c0a8f069112d
diff --git a/NuGet.config b/NuGet.config
index 5e5f9f5e6a7..db7a1a5ea28 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -11,9 +11,12 @@
     <!-- This is needed (currently) for the Xamarin.Android.Deploy.Installer dependency, getting the installer -->
     <!-- Android binary, to support delta APK install -->
     <add key="xamarin.android util" value="https://pkgs.dev.azure.com/xamarin/public/_packaging/Xamarin.Android/nuget/v3/index.json" />
-    <!-- Added manually for dotnet/runtime 6.0.11 -->
-    <add key="darc-pub-dotnet-emsdk-c3fc739" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-c3fc739c/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-runtime-1e1f688" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-1e1f688d/nuget/v3/index.json" />
+    <!-- Added manually for dotnet/runtime 7.0.11 -->
+    <add key="darc-pub-dotnet-emsdk-fcd8602" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-fcd86021/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-a2ad4f0" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-a2ad4f03/nuget/v3/index.json" />
+    <!-- Added manually for dotnet/runtime 6.0.22 -->
+    <add key="darc-pub-dotnet-emsdk-f9eee07" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-f9eee071/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-762f437" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-762f4379/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources />
 </configuration>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 34e1b360af3..cf4372e6e78 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.1.23417.5">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rc.1.23422.1">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>684771d03c2bb6deb58e20448c9be29191d2d445</Sha>
+      <Sha>85170c1c70401fabee8d4ed9345ff71df450eb8f</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="8.0.0-rc.1.23414.4" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index c39d74a2195..3ebdb16f131 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,7 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.1.23417.5</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rc.1.23422.1</MicrosoftDotnetSdkInternalPackageVersion>
     <MicrosoftNETILLinkTasksPackageVersion>8.0.0-rc.1.23414.4</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>8.0.0-rc.1.23419.3</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
diff --git a/external/Java.Interop b/external/Java.Interop
index 5adb4d48727..1c715a504b4 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 5adb4d487279d52dc10055f31bd1da9e1efab3ef
+Subproject commit 1c715a504b47cccbda72d031f048e5b8fb5ab593
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
index 52f0866c7dd..2b8ac126a4c 160000
--- a/external/xamarin-android-tools
+++ b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit 52f0866c7dd3abfb830d1d0642c9468091b864d4
+Subproject commit 2b8ac126a4cd31abe76ccae53631672636db0c76
diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs
index 7ce6c520bfe..a3fe0d7a4c0 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/XamarinProject.cs
@@ -95,6 +95,7 @@ public XamarinProject (string debugConfigurationName = "Debug", string releaseCo
 $@"<Project>
 	<PropertyGroup>
 		<Configuration>{Configuration}</Configuration>
+		<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
 	</PropertyGroup>
 </Project>"
 				});