Remove filter for Exception type during registry inquiry. (dotnet/cor…

…eclr#24725) Update Console output with more details. Commit migrated from dotnet/coreclr@128e5dd
zengande · May 22, 2019 · 40c8e86 · 40c8e86
1 parent 1cf568e
commit 40c8e86
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/coreclr/tests/src/Common/CoreCLRTestLibrary/Utilities.cs b/src/coreclr/tests/src/Common/CoreCLRTestLibrary/Utilities.cs
@@ -192,8 +192,9 @@ private static string GetInstallationTypeForWindows()
                 string value = "InstallationType";
                 return GetRegistryValueString(key, value);
             }
-            catch (Exception e) when (e is SecurityException || e is InvalidCastException || e is PlatformNotSupportedException /* UAP */)
+            catch (Exception e)
             {
+                Console.WriteLine($"{nameof(GetInstallationTypeForWindows)} exception: {e}");
                 return string.Empty;
             }
         }
@@ -430,11 +431,11 @@ public static int ExecuteAndUnload(string assemblyPath, string[] args, Action<As
             if (alcWeakRef.IsAlive)
             {
                 exitCode += 100;
-                Console.WriteLine("Unload failed");
+                Console.WriteLine($"Unload failed - {assemblyPath}");
             }
             else
             {
-                Console.WriteLine("Unload succeeded");
+                Console.WriteLine($"Unload succeeded - {assemblyPath}");
             }
 
             return exitCode;