diff --git a/build-tools/automation/yaml-templates/variables.yaml b/build-tools/automation/yaml-templates/variables.yaml index 050f31c9c27..586a5371b04 100644 --- a/build-tools/automation/yaml-templates/variables.yaml +++ b/build-tools/automation/yaml-templates/variables.yaml @@ -76,6 +76,9 @@ variables: value: true - name: DOTNET_GENERATE_ASPNET_CERTIFICATE value: false +# XBD Google Maven mirror support: https://github.com/dotnet/android-libraries/commit/4fe06d57f3ef7905fab0257d7246c97464d29e74 +- name: XamarinBuildDownloadGoogleMavenRepository + value: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-maven/maven/v1 # Fix network isolation requirements # See https://devdiv.visualstudio.com/DevDiv/_git/Xamarin.yaml-templates/pullrequest/750402 - name: DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs index b5c91792cf8..03287d5efbe 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs @@ -816,6 +816,7 @@ public void DuplicateRJavaOutput ([Values (AndroidRuntime.CoreCLR, AndroidRuntim new Package { Id = "Xamarin.GooglePlayServices.Base", Version = "118.2.0.5" }, new Package { Id = "Xamarin.GooglePlayServices.Basement", Version = "118.2.0.5" }, new Package { Id = "Xamarin.GooglePlayServices.Tasks", Version = "118.0.2.6" }, + KnownPackages.Xamarin_Build_Download, } }; proj.SetRuntime (runtime); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs index 11b95dcc3a7..615f3ff32b5 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs @@ -127,7 +127,7 @@ public static class KnownPackages }; public static Package Xamarin_Build_Download = new Package { Id = "Xamarin.Build.Download", - Version = "0.11.4", + Version = "0.11.6", }; public static Package NuGet_Build_Packaging = new Package { Id = "NuGet.Build.Packaging",