Skip to content

[Xamarin.Android.Build.Tests] Fix some of the dropbox links and the location of android-support-multidex.jar #562

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Apr 21, 2017
Merged

[Xamarin.Android.Build.Tests] Fix some of the dropbox links and the location of android-support-multidex.jar #562

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 7 additions & 4 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public void BuildLibraryZipBindigLibraryWithAarOfJar (string classParser)
proj.AndroidClassParser = classParser;
proj.Packages.Add (KnownPackages.AndroidSupportV4_22_1_1_1);
proj.Jars.Add (new AndroidItem.LibraryProjectZip ("Jars\\aFileChooserBinaries.zip") {
WebContent = "https://dl.dropboxusercontent.com/u/493047/2016/aFileChooserBinaries.zip"
WebContent = "https://www.dropbox.com/s/hl98jrvlw4d9vjy/aFileChooserBinaries.zip?dl=1"
});
proj.MetadataXml = @"
<metadata>
Expand Down Expand Up @@ -180,7 +180,7 @@ public void MergeAndroidManifest ()
};
binding.AndroidClassParser = "class-parse";
binding.Jars.Add (new AndroidItem.LibraryProjectZip ("Jars\\adal-1.0.7.aar") {
WebContent = "https://dl.dropboxusercontent.com/u/493047/2014/adal-1.0.7.aar"
WebContent = "https://www.dropbox.com/s/bubopadhd9d1l4b/adal-1.0.7.aar?dl=1"
});
binding.MetadataXml = @"
<metadata>
Expand Down Expand Up @@ -211,7 +211,7 @@ public void AnnotationSupport ()
};
binding.AndroidClassParser = "class-parse";
binding.Jars.Add (new AndroidItem.LibraryProjectZip ("Jars\\mylibrary.aar") {
WebContent = "https://dl.dropboxusercontent.com/u/493047/2015/mylibrary-debug.aar"
WebContent = "https://www.dropbox.com/s/53679881kg9rdiq/mylibrary-debug.aar?dl=1"
});
var bindingBuilder = CreateDllBuilder ("temp/AnnotationSupport");
Assert.IsTrue (bindingBuilder.Build (binding), "binding build failed");
Expand All @@ -227,7 +227,10 @@ public void BindingCustomJavaApplicationClass ()
IsRelease = true,
};
binding.AndroidClassParser = "class-parse";
binding.Jars.Add (new AndroidItem.EmbeddedJar (() => "$(MonoDroidInstallDirectory)\\lib\\mandroid\\android-support-multidex.jar"));
var multidexJar = Environment.OSVersion.Platform == PlatformID.Win32NT
? Path.Combine (Environment.GetFolderPath (Environment.SpecialFolder.ProgramFilesX86), "MSBuild", "Xamarin", "Android", "android-support-multidex.jar")
Copy link
Contributor

@jonpryor jonpryor Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd rather not hardcode %ProgramFiles(x86)%\..., because eventually we'll want to be able to build and run unit tests on Windows, and that environment will not be in %ProgramFiles(x86)%...

Perhaps we should go with this for now, and then fix it when we address PR #253?

Copy link
Contributor Author

@dellis1972 dellis1972 Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Outside of VS2017 (VS2015 etc) it is in Program Files (x86)..
Not sure how we run the tests under VS2017 because the locations depend on the version you run. Which sucks in my opinion.

Copy link
Contributor

@jonpryor jonpryor Apr 20, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The "proper" mechanism is to use the XAMARIN_ANDROID_REGKEY environment variable. This is how Visual Studio communicates to our build system where things are located...ish.

Related?

: Path.Combine ("$(MonoDroidInstallDirectory)", "lib", "mandroid", "android-support-multidex.jar");
binding.Jars.Add (new AndroidItem.EmbeddedJar (() => multidexJar));
using (var bindingBuilder = CreateDllBuilder ("temp/BindingCustomJavaApplicationClass/MultiDexBinding")) {
bindingBuilder.Build (binding);
var proj = new XamarinAndroidApplicationProject ();
Expand Down