From 41a224b0d963b93b22b27bc7b5780a6586b820cd Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Thu, 20 Apr 2017 12:37:57 +0100 Subject: [PATCH] [Xamarin.Android.Build.Tests] Fix some of the dropbox links and the location of android-support-multidex.jar Dropbox recently invalidated ALL shared folders/links. So we need to use new links. Also on windows android-support-multidex.jar in not in lib/mandroid... lib/mandroid does NOT exist. So we need to add a path so we pick that up from the right location. --- .../Xamarin.Android.Build.Tests/BindingBuildTest.cs | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs index 4b1194d4226..46b5fda7165 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs @@ -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 = @" @@ -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 = @" @@ -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"); @@ -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") + : 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 ();