From 3a14cacffa5832ed911160edf07a1cad69ed84f2 Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Mon, 12 Sep 2022 12:30:33 +0000
Subject: [PATCH 1/8] Update dependencies from
 https://github.com/dotnet/installer build 20220909.2

Microsoft.Dotnet.Sdk.Internal
 From Version 7.0.100-rc.2.22457.6 -> To Version 7.0.100-rc.2.22459.2
---
 eng/Version.Details.xml | 4 ++--
 eng/Versions.props      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 1f8dcaf88f1..13ad1cd3254 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,8 +1,8 @@
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22457.6">
+    <Dependency Name="Microsoft.Dotnet.Sdk.Internal" Version="7.0.100-rc.2.22459.2">
       <Uri>https://github.com/dotnet/installer</Uri>
-      <Sha>dd355bb777249689beba30978ac26e15c96da642</Sha>
+      <Sha>11f6b8f7129e34d5317f47ccbc110b2b11c05749</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.ILLink.Tasks" Version="7.0.100-1.22452.1" CoherentParentDependency="Microsoft.Dotnet.Sdk.Internal">
       <Uri>https://github.com/dotnet/linker</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index b77fd3b0fc6..aee1064345c 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -1,7 +1,7 @@
 <Project>
   <!--Package versions-->
   <PropertyGroup>
-    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22457.6</MicrosoftDotnetSdkInternalPackageVersion>
+    <MicrosoftDotnetSdkInternalPackageVersion>7.0.100-rc.2.22459.2</MicrosoftDotnetSdkInternalPackageVersion>
     <MicrosoftNETILLinkTasksPackageVersion>7.0.100-1.22452.1</MicrosoftNETILLinkTasksPackageVersion>
     <MicrosoftNETCoreAppRefPackageVersion>7.0.0-rc.2.22451.11</MicrosoftNETCoreAppRefPackageVersion>
     <MicrosoftDotNetApiCompatPackageVersion>7.0.0-beta.22103.1</MicrosoftDotNetApiCompatPackageVersion>

From f44454d797889bd5b56b3e730f9bfcea6f76dd8e Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 1 Sep 2022 23:24:16 -0500
Subject: [PATCH 2/8] Enable $(DisableTransitiveFrameworkReferenceDownloads)

---
 build-tools/automation/yaml-templates/variables.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml
index cb178563501..9cd5a21e22f 100644
--- a/build-tools/automation/yaml-templates/variables.yaml
+++ b/build-tools/automation/yaml-templates/variables.yaml
@@ -38,5 +38,9 @@ variables:
 # Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820
 - name: _WriteTelemetryProperties
   value: false
+# Workaround: error NU1102: Unable to find package Microsoft.NETCore.App.Host.osx-x64 with version (= 6.0.10)
+# https://github.com/dotnet/sdk/pull/25358
+- name: DisableTransitiveFrameworkReferenceDownloads
+  value: true
 - name: DotNetReleaseBranchPrefix
   value: refs/heads/release/

From 43c38f8f985a116c12607e5fa35845b028411b0b Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Mon, 12 Sep 2022 15:38:31 -0500
Subject: [PATCH 3/8] Revert "Enable
 $(DisableTransitiveFrameworkReferenceDownloads)"

This reverts commit f44454d797889bd5b56b3e730f9bfcea6f76dd8e.
---
 build-tools/automation/yaml-templates/variables.yaml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml
index 9cd5a21e22f..cb178563501 100644
--- a/build-tools/automation/yaml-templates/variables.yaml
+++ b/build-tools/automation/yaml-templates/variables.yaml
@@ -38,9 +38,5 @@ variables:
 # Workaround: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/1585820
 - name: _WriteTelemetryProperties
   value: false
-# Workaround: error NU1102: Unable to find package Microsoft.NETCore.App.Host.osx-x64 with version (= 6.0.10)
-# https://github.com/dotnet/sdk/pull/25358
-- name: DisableTransitiveFrameworkReferenceDownloads
-  value: true
 - name: DotNetReleaseBranchPrefix
   value: refs/heads/release/

From 9a3a0e74e34d96244ae17bd6695f63dbdf37a762 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Mon, 12 Sep 2022 15:39:12 -0500
Subject: [PATCH 4/8] Use different feed for dotnet/runtime/release/6.0

Context: https://github.com/xamarin/xamarin-android/pull/7355
---
 NuGet.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NuGet.config b/NuGet.config
index b3bc9e94d89..e72efe88fb0 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -11,7 +11,7 @@
     <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.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" />
+    <add key="darc-pub-dotnet-runtime-f2112e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-f2112e3d/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources />
 </configuration>

From fcc21dabdc9f913a3625bdb767ff017f137ae19b Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 15 Sep 2022 13:41:34 -0500
Subject: [PATCH 5/8] Revert "Use different feed for
 dotnet/runtime/release/6.0"

This reverts commit 9a3a0e74e34d96244ae17bd6695f63dbdf37a762.
---
 NuGet.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NuGet.config b/NuGet.config
index e72efe88fb0..b3bc9e94d89 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -11,7 +11,7 @@
     <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.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-f2112e3" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-f2112e3d/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>
   <disabledPackageSources />
 </configuration>

From 85ec2d40743b4020d78b5fc3d7a4581b551e490a Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 15 Sep 2022 13:44:03 -0500
Subject: [PATCH 6/8] Use latest dotnet/runtime/release/6.0 feed

Context: https://github.com/xamarin/xamarin-android/blob/release/6.0.4xx/NuGet.config
---
 NuGet.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/NuGet.config b/NuGet.config
index b3bc9e94d89..a24c4eef1e6 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -11,7 +11,7 @@
     <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.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" />
+    <add key="darc-pub-dotnet-runtime-8c6bcad" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-8c6bcad1/nuget/v3/index.json" />
   </packageSources>
   <disabledPackageSources />
 </configuration>

From 6a684bcbe3b3e19fb8e5ca48559839a2815d5ee0 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 15 Sep 2022 13:54:20 -0500
Subject: [PATCH 7/8] Set $(DisableTransitiveFrameworkReferenceDownloads)

---
 Directory.Build.props | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 97f540f96af..8440bf6ab6d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -23,6 +23,8 @@
     <RollForward>Major</RollForward>
     <!-- We don't need to be warned that we are using a preview .NET -->
     <SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
+    <!-- Disables the transitive restore of packages like Microsoft.AspNetCore.App.Ref, Microsoft.WindowsDesktop.App.Ref -->
+    <DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(MSBuildRuntimeType)' == 'Core' ">

From a5651a792389caefca8637e4e50f9fc77e75d8ae Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Thu, 15 Sep 2022 16:44:49 -0500
Subject: [PATCH 8/8] More $(DisableTransitiveFrameworkReferenceDownloads)

---
 .../Tests/Xamarin.ProjectTools/Android/XASdkProject.cs          | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XASdkProject.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XASdkProject.cs
index a9d5b2703ac..491b222a2d9 100644
--- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XASdkProject.cs
+++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/XASdkProject.cs
@@ -63,6 +63,8 @@ public XASdkProject (string outputType = "Exe", [CallerMemberName] string packag
 			SetProperty (KnownProperties.OutputType, outputType);
 			SetProperty (KnownProperties.Nullable, "enable");
 			SetProperty (KnownProperties.ImplicitUsings, "enable");
+			// Disables the transitive restore of packages like Microsoft.AspNetCore.App.Ref, Microsoft.WindowsDesktop.App.Ref
+			SetProperty ("DisableTransitiveFrameworkReferenceDownloads", "true");
 
 			// Add relevant Android content to our project without writing it to the .csproj file
 			if (outputType == "Exe") {