Skip to content

Commit

Permalink
Bump to xamarin/xamarin-android-tools/main@26d65d9 (#741)
Browse files Browse the repository at this point in the history
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
  • Loading branch information
pjcollins committed Oct 20, 2020
1 parent 9c73dbf commit 5fe912a
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions build-tools/automation/azure-pipelines.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion external/xamarin-android-tools

0 comments on commit 5fe912a

Please sign in to comment.