From 5783a90859aeec67668eb3e3dd21c852df5ce94a Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 19 Oct 2020 16:57:06 -0400 Subject: [PATCH 1/2] Bump to xamarin/xamarin-android-tools@26d65d9 --- .gitmodules | 2 +- external/xamarin-android-tools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 919159a08..5349df982 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "external/xamarin-android-tools"] path = external/xamarin-android-tools url = https://github.com/xamarin/xamarin-android-tools.git - branch = master + branch = main diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index f2af06f2a..26d65d959 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit f2af06f2a2c1966011b6b04a113560de37041cbc +Subproject commit 26d65d95943b18bb9575d75c8c60ce36180a0db9 From 23ab2fc132e18fbe5dfe633720bd30f8374fd07f Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Mon, 19 Oct 2020 17:17:46 -0400 Subject: [PATCH 2/2] Update azure-pipelines.yaml --- build-tools/automation/azure-pipelines.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml index 6720f8781..8f09e9951 100644 --- a/build-tools/automation/azure-pipelines.yaml +++ b/build-tools/automation/azure-pipelines.yaml @@ -39,8 +39,8 @@ jobs: - task: NuGetCommand@2 inputs: - command: restore - restoreSolution: 'external\xamarin-android-tools\Xamarin.Android.Tools.sln' + command: custom + arguments: restore external\xamarin-android-tools\Xamarin.Android.Tools.sln -ConfigFile external\xamarin-android-tools\NuGet.config - task: MSBuild@1 displayName: MSBuild Java.Interop.sln /t:Prepare