From c78d52ac34723279b33127d459c3838170835ae3 Mon Sep 17 00:00:00 2001 From: Jonathan Pryor Date: Thu, 26 Jul 2018 18:22:41 -0400 Subject: [PATCH] Bump to xamarin/xamarin-android-tools:master@917d3b3c Context: https://paper.dropbox.com/doc/OpenJDK-and-You--AH1yWKdVXgno~uXYfmcUAZTwAg-NoECAe2XkBQeoxFfGL6ea Context: https://github.com/xamarin/xamarin-android-tools/pull/29#issuecomment-400048306 Context: https://github.com/xamarin/xamarin-android/pull/2004#issuecomment-409924069 Context: https://github.com/xamarin/xamarin-android-tools/blob/917d3b3ce455eed6a4a0e4271d34661bdf0b261d/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs#L256 Fixes: http://work.devdiv.io/646086 Fixes: http://work.devdiv.io/652760 Fixes: https://devdiv.visualstudio.com/DevDiv/_workitems/edit/597752 Fixes: https://github.com/xamarin/xamarin-android-tools/issues/26 Fixes: https://github.com/xamarin/xamarin-android-tools/issues/39 Update & export `%JAVA_HOME%`, `%PATH%` on Windows. --- external/xamarin-android-tools | 2 +- .../Tests/Xamarin.Android.Build.Tests/PackagingTest.cs | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/external/xamarin-android-tools b/external/xamarin-android-tools index 50af063b2fd..917d3b3ce45 160000 --- a/external/xamarin-android-tools +++ b/external/xamarin-android-tools @@ -1 +1 @@ -Subproject commit 50af063b2fdf0eda752882a4a61129e0e55c746c +Subproject commit 917d3b3ce455eed6a4a0e4271d34661bdf0b261d diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs index fa30b5a9aac..7c4a933f1cb 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs @@ -229,10 +229,15 @@ public void CheckSignApk ([Values(true, false)] bool useApkSigner, [Values(true, using (var b = CreateApkBuilder (Path.Combine ("temp", TestContext.CurrentContext.Test.Name))) { b.Verbosity = Microsoft.Build.Framework.LoggerVerbosity.Diagnostic; Assert.IsTrue (b.Build (proj), "build failed"); - Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)")); + Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"), + "First build should not contain warnings! Contains\n" + + string.Join ("\n", b.LastBuildOutput.Where (line => line.Contains ("warning")))); proj.AndroidResources.First ().Timestamp = null; Assert.IsTrue (b.Build (proj), "Second build failed"); - Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)")); + Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"), "Second build should not contain warnings!"); + Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"), + "Second build should not contain warnings! Contains\n" + + string.Join ("\n", b.LastBuildOutput.Where (line => line.Contains ("warning")))); } }