From f63ac29fb3e48bfb5785e9fad03a64f68f7fc750 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Thu, 26 Oct 2023 08:38:51 -0500
Subject: [PATCH] Bump to dotnet/installer/release/8.0.1xx@1dd37f868b
 8.0.100-rtm.23524.17 (#8443)

Changes: https://github.com/dotnet/installer/compare/1657e2bb7b...1dd37f868b

Updates: Microsoft.Dotnet.Sdk.Internal: from 8.0.100-rtm.23518.33 to 8.0.100-rtm.23524.17

Other changes:

* NuGet feeds for dotnet/runtime 7.0.14

* NuGet feeds for dotnet/runtime 6.0.25

* Set `$(RestoreAdditionalProjectSources)` for submodules

* Update NuGet.config

Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
---
 NuGet.config                                  | 11 ++++++-----
 eng/Version.Details.xml                       |  4 ++--
 eng/Versions.props                            |  2 +-
 external/Java.Interop.override.props          |  4 ++++
 external/monodroid.override.props             |  4 ++++
 external/xamarin-android-tools.override.props |  8 ++++++++
 6 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 external/xamarin-android-tools.override.props

diff --git a/NuGet.config b/NuGet.config
index a3c94bd6166..a24c41ad9d8 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -19,11 +19,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 7.0.12 -->
-    <add key="darc-pub-dotnet-emsdk-9506882" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-95068821/nuget/v3/index.json" />
-    <add key="darc-pub-dotnet-runtime-26e0f82" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json" />
-    <!-- Added manually for dotnet/runtime 6.0.23 -->
-    <add key="darc-pub-dotnet-runtime-301ba1e" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json" />
+    <!-- Added manually for dotnet/runtime 7.0.14 -->
+    <add key="darc-pub-dotnet-emsdk-942bfc8" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-942bfc8c/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-35db500" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35db500c/nuget/v3/index.json" />
+    <!-- Added manually for dotnet/runtime 6.0.25 -->
+    <add key="darc-pub-dotnet-emsdk-d8bc162" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-emsdk-d8bc162c/nuget/v3/index.json" />
+    <add key="darc-pub-dotnet-runtime-4a336b1" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4a336b1c/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources />
 </configuration>
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 131df9929d7..9802f64a9f2 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-rtm.23518.33">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="8.0.100-rtm.23524.17">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>1657e2bb7b7766b5f0d27b9dbbb3be35634840c4</Sha>
+      <Sha>1dd37f868b1e3abceced391beea9667e0af10694</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink" Version="8.0.0-rtm.23524.7">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index ecc3c47881f..20fa0ee88f9 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,7 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rtm.23518.33</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>8.0.100-rtm.23524.17</MicrosoftDotnetSdkInternalPackageVersion>
     <MicrosoftNETILLinkPackageVersion>8.0.0-rtm.23524.7</MicrosoftNETILLinkPackageVersion>
     <MicrosoftNETILLinkTasksPackageVersion>8.0.0</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>8.0.0</MicrosoftNETCoreAppRefPackageVersion>
diff --git a/external/Java.Interop.override.props b/external/Java.Interop.override.props
index 5242a70af3f..ceea3118a00 100644
--- a/external/Java.Interop.override.props
+++ b/external/Java.Interop.override.props
@@ -3,6 +3,10 @@
   <PropertyGroup>
     <XamarinAndroidToolsDirectory>$(MSBuildThisFileDirectory)xamarin-android-tools</XamarinAndroidToolsDirectory>
     <Standalone>True</Standalone>
+    <RestoreAdditionalProjectSources>
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35db500c/nuget/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4a336b1c/nuget/v3/index.json;
+    </RestoreAdditionalProjectSources>
   </PropertyGroup>
 
 </Project>
diff --git a/external/monodroid.override.props b/external/monodroid.override.props
index 8cbac6945cf..894c67a7e15 100644
--- a/external/monodroid.override.props
+++ b/external/monodroid.override.props
@@ -2,6 +2,10 @@
 
   <PropertyGroup>
     <XamarinAndroidToolsDirectory>$(MSBuildThisFileDirectory)xamarin-android-tools</XamarinAndroidToolsDirectory>
+    <RestoreAdditionalProjectSources>
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35db500c/nuget/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4a336b1c/nuget/v3/index.json;
+    </RestoreAdditionalProjectSources>
   </PropertyGroup>
 
 </Project>
diff --git a/external/xamarin-android-tools.override.props b/external/xamarin-android-tools.override.props
new file mode 100644
index 00000000000..d04a0151ab0
--- /dev/null
+++ b/external/xamarin-android-tools.override.props
@@ -0,0 +1,8 @@
+<Project>
+  <PropertyGroup>
+    <RestoreAdditionalProjectSources>
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-35db500c/nuget/v3/index.json;
+      https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-4a336b1c/nuget/v3/index.json;
+    </RestoreAdditionalProjectSources>
+  </PropertyGroup>
+</Project>