diff --git a/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs index 7e710bc..5738fb1 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/AndroidSdkInfo.cs @@ -10,10 +10,9 @@ public class AndroidSdkInfo { AndroidSdkBase sdk; - public AndroidSdkInfo (Action logger, string androidSdkPath = null, string androidNdkPath = null, string javaSdkPath = null) + public AndroidSdkInfo (Action logger = null, string androidSdkPath = null, string androidNdkPath = null, string javaSdkPath = null) { - if (logger == null) - throw new ArgumentNullException (nameof (logger)); + logger = logger ?? DefaultConsoleLogger; sdk = CreateSdk (logger); sdk.Initialize (androidSdkPath, androidNdkPath, javaSdkPath); diff --git a/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs index 6e1026a..d73b748 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs @@ -345,7 +345,7 @@ static IEnumerable GetLibexecJdkPaths (Action logger if (string.IsNullOrEmpty (e.Data)) return; xml.Append (e.Data); - }); + }, includeStderr: false); var plist = XElement.Parse (xml.ToString ()); foreach (var info in plist.Elements ("array").Elements ("dict")) { var JVMHomePath = (XNode) info.Elements ("key").FirstOrDefault (e => e.Value == "JVMHomePath"); diff --git a/src/Xamarin.Android.Tools.AndroidSdk/ProcessUtils.cs b/src/Xamarin.Android.Tools.AndroidSdk/ProcessUtils.cs index 87b02ca..352eb77 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/ProcessUtils.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/ProcessUtils.cs @@ -131,7 +131,7 @@ public static Task ExecuteToolAsync (string exe, Func logger = null; - Assert.Throws (() => new AndroidSdkInfo (logger)); - } - [Test] public void Constructor_Paths () {