diff --git a/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs b/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs index e973d19..f7a0f0a 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/JdkInfo.cs @@ -350,7 +350,14 @@ static IEnumerable GetLibexecJdkPaths (Action logger return; xml.Append (e.Data); }, includeStderr: false); - var plist = XElement.Parse (xml.ToString ()); + + XElement plist; + try { + plist = XElement.Parse (xml.ToString ()); + } catch (XmlException e) { + logger (TraceLevel.Warning, string.Format (Resources.InvalidXmlLibExecJdk_path_args_message, jhp.FileName, jhp.Arguments, e.Message)); + yield break; + } foreach (var info in plist.Elements ("array").Elements ("dict")) { var JVMHomePath = (XNode) info.Elements ("key").FirstOrDefault (e => e.Value == "JVMHomePath"); if (JVMHomePath == null) diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.Designer.cs b/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.Designer.cs index 0675492..9013f19 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.Designer.cs +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.Designer.cs @@ -77,5 +77,14 @@ internal static string InvalidMonodroidConfigFile_path_message { return ResourceManager.GetString("InvalidMonodroidConfigFile_path_message", resourceCulture); } } + + /// + /// Looks up a localized string similar to An exception occurred while reading the output of '{0} {1}'. Exception: {2}. + /// + internal static string InvalidXmlLibExecJdk_path_args_message { + get { + return ResourceManager.GetString("InvalidXmlLibExecJdk_path_args_message", resourceCulture); + } + } } } diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx b/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx index 4e90d1a..7b04761 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/Resources.resx @@ -130,4 +130,7 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.cs.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.cs.xlf index 4ee39f8..bd8c0d8 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.cs.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.cs.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.de.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.de.xlf index 0ef03af..f4bf5dd 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.de.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.de.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.es.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.es.xlf index 745a7b1..0e1e998 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.es.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.es.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.fr.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.fr.xlf index 88ef6bd..1a577af 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.fr.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.fr.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.it.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.it.xlf index e450f94..c94f2d3 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.it.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.it.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ja.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ja.xlf index 964e5f8..6de35c2 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ja.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ja.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ko.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ko.xlf index f9c441f..c96a2cc 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ko.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ko.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.pl.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.pl.xlf index 124fad0..102d803 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.pl.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.pl.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.pt-BR.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.pt-BR.xlf index 948c0ba..394aa06 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.pt-BR.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.pt-BR.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ru.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ru.xlf index 0b14aed..b39553d 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ru.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.ru.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.tr.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.tr.xlf index 3406e2d..020759c 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.tr.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.tr.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.zh-Hans.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.zh-Hans.xlf index 1414a0f..4a160a1 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.zh-Hans.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.zh-Hans.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file diff --git a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.zh-Hant.xlf b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.zh-Hant.xlf index c4db954..74d9a2e 100644 --- a/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.zh-Hant.xlf +++ b/src/Xamarin.Android.Tools.AndroidSdk/Properties/xlf/Resources.zh-Hant.xlf @@ -17,6 +17,11 @@ {0} - The path of the file being read. {1} - The exception message of the associated exception. + + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + An exception occurred while reading the output of '{0} {1}'. Exception: {2} + + \ No newline at end of file