From 8a06bdd18a6e6c2255619ebab9bc8e0edca50073 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 27 Sep 2023 14:41:45 -0500
Subject: [PATCH 1/2] [build] don't pass `$(RestoreAdditionalProjectSources)`
 as a global property

This partially reverts 4c7b6455.

Opening this to test how we can fix this with a change in java.interop.

Ran:

    git checkout 4c7b6455b7bbf60268520e8d55996133210d1a37~1 build-tools\scripts\DotNet.targets
---
 build-tools/scripts/DotNet.targets | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/build-tools/scripts/DotNet.targets b/build-tools/scripts/DotNet.targets
index 83b37c93f91..2c477fe1b55 100644
--- a/build-tools/scripts/DotNet.targets
+++ b/build-tools/scripts/DotNet.targets
@@ -8,12 +8,6 @@
     <MauiWorkloadToInstall Condition=" '$(MauiWorkloadToInstall)' == '' ">maui-android</MauiWorkloadToInstall>
   </PropertyGroup>
 
-  <ItemGroup>
-    <!-- Feeds for dotnet/runtime, to be passed to external/java.interop/external/xamarin-android-tools -->
-    <_RestoreAdditionalProjectSources Include="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-26e0f822/nuget/v3/index.json" />
-    <_RestoreAdditionalProjectSources Include="https://pkgs.dev.azure.com/dnceng/public/_packaging/darc-pub-dotnet-runtime-301ba1ee/nuget/v3/index.json" />
-  </ItemGroup>
-
   <Target Name="BuildExternal">
     <Exec
         Command="&quot;$(DotNetPreviewTool)&quot; build monodroid.proj -c $(Configuration) -p:XamarinAndroidSourcePath=$(_Root) -p:DebuggingToolsOutputDirectory=$(MicrosoftAndroidSdkOutDir) -p:CompatTargetsOutputDirectory=$(XAInstallPrefix)xbuild/Novell -bl:$(_BinlogPathPrefix)-build-monodroid.binlog"
@@ -22,17 +16,8 @@
   </Target>
 
   <Target Name="PrepareJavaInterop">
-    <!-- See: https://github.com/dotnet/sdk/issues/8792#issuecomment-393756980 -->
-    <PropertyGroup Condition="'$(HostOS)' == 'Windows'">
-      <_Begin>\&quot;</_Begin>
-      <_End>\&quot;</_End>
-    </PropertyGroup>
-    <PropertyGroup Condition="'$(HostOS)' != 'Windows'">
-      <_Begin>&apos;&quot;</_Begin>
-      <_End>&quot;&apos;</_End>
-    </PropertyGroup>
     <Exec
-        Command="&quot;$(DotNetPreviewTool)&quot; build -t:Prepare Java.Interop.sln -c $(Configuration) -p:JdksRoot=$(JavaSdkDirectory) -p:DotnetToolPath=$(DotNetPreviewTool) -p:RestoreAdditionalProjectSources=$(_Begin)@(_RestoreAdditionalProjectSources)$(_End) -bl:$(_BinlogPathPrefix)-prepare-java-interop.binlog"
+        Command="&quot;$(DotNetPreviewTool)&quot; build -t:Prepare Java.Interop.sln -c $(Configuration) -p:JdksRoot=$(JavaSdkDirectory) -p:DotnetToolPath=$(DotNetPreviewTool) -bl:$(_BinlogPathPrefix)-prepare-java-interop.binlog"
         WorkingDirectory="$(_Root)external\Java.Interop"
     />
   </Target>

From d65f2cf4df33bc98d5138ca672e8362a4c1de004 Mon Sep 17 00:00:00 2001
From: Jonathan Peppers <jonathan.peppers@microsoft.com>
Date: Wed, 27 Sep 2023 15:49:17 -0500
Subject: [PATCH 2/2] Update Java.Interop

---
 external/Java.Interop | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/external/Java.Interop b/external/Java.Interop
index 75d8221d44b..04e1b44d9a5 160000
--- a/external/Java.Interop
+++ b/external/Java.Interop
@@ -1 +1 @@
-Subproject commit 75d8221d44bb3fb0781f73b4fa53c99da7aa8d06
+Subproject commit 04e1b44d9a52a775a809c634fdd58d00ab0743a1