From 07cb311e10d30fe94a29b7804ab01393786958a6 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
 <42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 16 Aug 2024 15:43:50 -0500
Subject: [PATCH] Bump to dotnet/sdk/main@3586c8047b 9.0.100-rc.1.24415.1
 (#9204)

Changes: https://github.com/dotnet/sdk/compare/43360291a5...3586c8047b
Changes: https://github.com/dotnet/runtime/compare/68511fd27f...605ff6f648

Updates:

* Microsoft.NET.Sdk: from 9.0.100-rc.1.24409.1 to 9.0.100-rc.1.24415.1
* Microsoft.NETCore.App.Ref: from 9.0.0-rc.1.24408.12 to 9.0.0-rc.1.24413.14
* Microsoft.NET.ILLink.Tasks: from 9.0.0-rc.1.24408.12 to 9.0.0-rc.1.24413.14

~~ Other changes ~~

* Revert "Workaround: https://github.com/dotnet/runtime/issues/105516"

This reverts commit 18193b73c571aff61b2e039856c0dac2245cdb25.

Co-authored-by: Jonathan Peppers <jonathan.peppers@microsoft.com>
---
 build-tools/automation/azure-pipelines.yaml |  2 --
 eng/Version.Details.xml                     | 12 ++++++------
 eng/Versions.props                          |  6 +++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 6307c04e50c..aa996bb4637 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -205,8 +205,6 @@ extends:
 
         - template: /build-tools/automation/yaml-templates/apk-instrumentation.yaml@self
           parameters:
-            # FIXME: https://github.com/dotnet/runtime/issues/105516
-            condition: false
             configuration: $(XA.Build.Configuration)
             testName: Mono.Android.NET_Tests-AotLlvm
             project: tests/Mono.Android-Tests/Runtime-Microsoft.Android.Sdk/Mono.Android.NET-Tests.csproj
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index c5e6dc9c2c7..f73ae74b2ec 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,16 +1,16 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.1.24409.1">
+    <Dependency Name="Microsoft.NET.Sdk" Version="9.0.100-rc.1.24415.1">
       <Uri>https://github.com/dotnet/sdk</Uri>
-      <Sha>43360291a50c9c7c471551f8f8363919d38014ea</Sha>
+      <Sha>3586c8047b796e0d30fdb2d95ff8431167d86b9a</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rc.1.24408.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="9.0.0-rc.1.24413.14" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>68511fd27fe4055ce5203742998ba12019dfcbd4</Sha>
+      <Sha>605ff6f6485101d4bd1eabb9ab97af345eee67a1</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.1.24408.12" CoherentParentDependency="Microsoft.NET.Sdk">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="9.0.0-rc.1.24413.14" CoherentParentDependency="Microsoft.NET.Sdk">
       <Uri>https://github.com/dotnet/runtime</Uri>
-      <Sha>68511fd27fe4055ce5203742998ba12019dfcbd4</Sha>
+      <Sha>605ff6f6485101d4bd1eabb9ab97af345eee67a1</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Workload.Emscripten.Current.Manifest-9.0.100.Transport" Version="9.0.0-rc.1.24402.2" CoherentParentDependency="Microsoft.NETCore.App.Ref">
       <Uri>https://github.com/dotnet/emsdk</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 71bbba8a538..31df8bccc8c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,10 +1,10 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftNETSdkPackageVersion>9.0.100-rc.1.24409.1</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>9.0.100-rc.1.24415.1</MicrosoftNETSdkPackageVersion>
     <MicrosoftDotnetSdkInternalPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftDotnetSdkInternalPackageVersion>
-    <MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.1.24408.12</MicrosoftNETILLinkTasksPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.1.24408.12</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETILLinkTasksPackageVersion>9.0.0-rc.1.24413.14</MicrosoftNETILLinkTasksPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>9.0.0-rc.1.24413.14</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>
     <MicrosoftDotNetBuildTasksFeedPackageVersion>9.0.0-beta.24408.2</MicrosoftDotNetBuildTasksFeedPackageVersion>
     <MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>9.0.0-rc.1.24402.2</MicrosoftNETWorkloadEmscriptenCurrentManifest90100TransportVersion>