Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build-tools/automation/azure-pipelines-apidocs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ extends:
inputs:
forceReinstallCredentialProvider: true

- script: dotnet tool update -v:n boots --version 1.1.0.36 --add-source "https://api.nuget.org/v3/index.json" --global
- script: dotnet tool update -v:n boots --version 1.1.0.36 --global
displayName: Install boots

- script: boots https://download.mono-project.com/archive/6.12.0/macos-10-universal/MonoFramework-MDK-6.12.0.188.macos10.xamarin.universal.pkg
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ public void DotNetBuild (string runtimeIdentifiers, bool isRelease, bool aot, bo
ProjectName = "Test Me",
RootNamespace = "Test.Me",
EnableDefaultItems = true,
ExtraNuGetConfigSources = {
// Microsoft.AspNetCore.Components.WebView is not in dotnet-public
"https://api.nuget.org/v3/index.json",
},
PackageReferences = {
new Package { Id = "Xamarin.AndroidX.AppCompat", Version = "1.7.1.3" },
// Using * here, so we explicitly get newer packages
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ namespace Xamarin.Android.Build.Tests
[TestFixture]
public class FilterAssembliesTests : BaseTest
{
const string DotNetPublicPackageBaseAddress = "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-public/nuget/v3/flat2";

string tempDirectory;

[SetUp]
Expand All @@ -32,6 +34,12 @@ public void TearDown ()
Task<string> DownloadFromNuGet (string url, string filename = "") =>
Task.Factory.StartNew (() => new DownloadedCache ().GetAsFile (url, filename));

static string GetPackageUrl (string packageId, string version)
{
var lowercaseId = packageId.ToLowerInvariant ();
return $"{DotNetPublicPackageBaseAddress}/{lowercaseId}/{version}/{lowercaseId}.{version}.nupkg";
}
Comment thread
jonathanpeppers marked this conversation as resolved.
Resolved

async Task<string []> GetAssembliesFromNuGet (string url, string filename, string path)
{
var assemblies = new List<string> ();
Expand Down Expand Up @@ -65,7 +73,7 @@ string [] Run (params string [] assemblies)
public async Task CircleImageView ()
{
var assemblies = await GetAssembliesFromNuGet (
"https://www.nuget.org/api/v2/package/Refractored.Controls.CircleImageView/1.0.1",
GetPackageUrl ("Refractored.Controls.CircleImageView", "1.0.1"),
"Refractored.Controls.CircleImageView.1.0.1.nupkg",
"lib/MonoAndroid10/");
var actual = Run (assemblies);
Expand All @@ -77,7 +85,7 @@ public async Task CircleImageView ()
public async Task XamarinForms ()
{
var assemblies = await GetAssembliesFromNuGet (
"https://www.nuget.org/api/v2/package/Xamarin.Forms/3.6.0.220655",
GetPackageUrl ("Xamarin.Forms", "3.6.0.220655"),
"Xamarin.Forms.3.6.0.220655.nupkg",
"lib/MonoAndroid90/");
var actual = Run (assemblies);
Expand All @@ -93,7 +101,7 @@ public async Task XamarinForms ()
public async Task GuavaListenableFuture ()
{
var assemblies = await GetAssembliesFromNuGet (
"https://www.nuget.org/api/v2/package/Xamarin.Google.Guava.ListenableFuture/1.0.0",
GetPackageUrl ("Xamarin.Google.Guava.ListenableFuture", "1.0.0"),
"Xamarin.Google.Guava.ListenableFuture.1.0.0.nupkg",
"lib/MonoAndroid50/");
var actual = Run (assemblies);
Expand Down
3 changes: 0 additions & 3 deletions tests/MSBuildDeviceIntegration/Tests/InstallAndRunTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2526,9 +2526,6 @@ public static void logEvent(String eventName) {{

var proj = new XamarinAndroidApplicationProject (packageName: PackageUtils.MakePackageName (runtime)) {
IsRelease = isRelease,
ExtraNuGetConfigSources = {
"https://api.nuget.org/v3/index.json",
},
OtherBuildItems = {
new AndroidItem.TransformFile ("Transforms\\Metadata.xml") {
TextContent = () => $@"<metadata><attr path=""/api/package[@name='{gradleModule.PackageName}']"" name=""managedName"">Facebook</attr></metadata>",
Expand Down
Loading