Bump to xamarin/xamarin-android-tools/main@26d65d9 (#741)

pjcollins · web-flow · commit 5fe912adf77a · 2020-10-20T11:57:48.000-04:00
Changes: dotnet/android-tools@f2af06f...26d65d9 * dotnet/android-tools@26d65d9: [Xamarin.Android.Tools.AndroidSdk] Update SDK component for API-30 (#99) * dotnet/android-tools@1878e43: [Xamarin.Android.Tools.AndroidSdk] Error & Warning Localization (#96) Additionally, the "main" branch for xamarin/xamarin-android-tools has changed from xamarin-android-tools/master to xamarin-android-tools/main. Update `.gitmodules` accordingly. Finally, update the `nuget restore Xamarin.Android.Tools.sln` command executed by `azure-pipelines.yaml` to also provide `-ConfigFile external\xamarin-android-tools\NuGet.config` in order to prevent the following failure on CI: NU1101: Unable to find package XliffTasks. No packages exist with this id in source(s): NuGetOrg
diff --git 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/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
diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools
@@ -1 +1 @@
-Subproject commit f2af06f2a2c1966011b6b04a113560de37041cbc
+Subproject commit 26d65d95943b18bb9575d75c8c60ce36180a0db9
