Skip to content

Commit adb7d10

Browse files
[tests] Route Xamarin.Build.Download Maven downloads through mirror (#12544)
## Summary - update the test Xamarin.Build.Download pin from 0.11.4 to 0.11.6 - expose `XamarinBuildDownloadGoogleMavenRepository` repository-wide through the shared Azure Pipelines variables template - route eligible Google Maven downloads through dnceng's `dotnet-public-maven` feed - directly pin the Google Play Services test that would otherwise resolve XBD 0.11.4 transitively The XBD implementation only rewrites URLs beginning with `https://dl.google.com/dl/android/maven2/`; Android SDK/NDK and partial ZIP URLs such as `dl-ssl.google.com/android/repository/...` remain unchanged. ## Validation - parsed the shared pipeline variables YAML - verified an uppercase Azure Pipelines-style environment variable reaches nested `dotnet msbuild` as `$(XamarinBuildDownloadGoogleMavenRepository)` - built `xa-prep-tasks` and `Xamarin.ProjectTools` - inspected the relevant NuGet dependency graphs to identify transitive XBD consumers - migrated Xamarin.Build.Download 0.11.6 through the quarantine feed and verified it is available on dnceng `dotnet-public` Implementation reference: dotnet/android-libraries@4fe06d5 Co-authored-by: Copilot App <223556219+Copilot@users.noreply.github.com>
1 parent 17eacfa commit adb7d10

3 files changed

Lines changed: 5 additions & 1 deletion

File tree

build-tools/automation/yaml-templates/variables.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,9 @@ variables:
7676
value: true
7777
- name: DOTNET_GENERATE_ASPNET_CERTIFICATE
7878
value: false
79+
# XBD Google Maven mirror support: https://github.com/dotnet/android-libraries/commit/4fe06d57f3ef7905fab0257d7246c97464d29e74
80+
- name: XamarinBuildDownloadGoogleMavenRepository
81+
value: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public-maven/maven/v1
7982
# Fix network isolation requirements
8083
# See https://devdiv.visualstudio.com/DevDiv/_git/Xamarin.yaml-templates/pullrequest/750402
8184
- name: DOTNET_CLI_WORKLOAD_UPDATE_NOTIFY_DISABLE

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest2.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -835,6 +835,7 @@ public void DuplicateRJavaOutput ([Values (AndroidRuntime.CoreCLR, AndroidRuntim
835835
new Package { Id = "Xamarin.GooglePlayServices.Base", Version = "118.2.0.5" },
836836
new Package { Id = "Xamarin.GooglePlayServices.Basement", Version = "118.2.0.5" },
837837
new Package { Id = "Xamarin.GooglePlayServices.Tasks", Version = "118.0.2.6" },
838+
KnownPackages.Xamarin_Build_Download,
838839
}
839840
};
840841
proj.SetRuntime (runtime);

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Android/KnownPackages.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ public static class KnownPackages
127127
};
128128
public static Package Xamarin_Build_Download = new Package {
129129
Id = "Xamarin.Build.Download",
130-
Version = "0.11.4",
130+
Version = "0.11.6",
131131
};
132132
public static Package NuGet_Build_Packaging = new Package {
133133
Id = "NuGet.Build.Packaging",

0 commit comments

Comments
 (0)