From: Mike McLaughlin <mikem@microsoft.com>
Date: Fri, 22 Nov 2019 02:22:25 +0000 (-0800)
Subject: Add 3.1 to the installed host runtimes (#636)
X-Git-Tag: submit/tizen/20200402.013218~14^2^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=16ae7309122b9ffc35871bc3151d22984f99e4cf;p=platform%2Fcore%2Fdotnet%2Fdiagnostics.git

Add 3.1 to the installed host runtimes (#636)

Add 3.1 to the installed host runtimes

Don`t enable exception callback if bpmd hasn't been executed
---

diff --git a/src/SOS/Strike/hostcoreclr.cpp b/src/SOS/Strike/hostcoreclr.cpp
index 92fc0900b..4c45b3ce1 100644
--- a/src/SOS/Strike/hostcoreclr.cpp
+++ b/src/SOS/Strike/hostcoreclr.cpp
@@ -349,9 +349,9 @@ static bool FindDotNetVersion(int majorFilter, int minorFilter, std::string& hos
 
 #ifdef FEATURE_PAL
 const char *g_linuxPaths[] = {
-//  "/rh-dotnet22/root/usr/bin/dotnet/shared/Microsoft.NETCore.App",
+    "/rh-dotnet31/root/usr/bin/dotnet/shared/Microsoft.NETCore.App",
+    "/rh-dotnet30/root/usr/bin/dotnet/shared/Microsoft.NETCore.App",
     "/rh-dotnet21/root/usr/bin/dotnet/shared/Microsoft.NETCore.App",
-    "/rh-dotnet20/root/usr/bin/dotnet/shared/Microsoft.NETCore.App",
     "/usr/share/dotnet/shared/Microsoft.NETCore.App",
 };
 #endif
@@ -405,11 +405,15 @@ static HRESULT GetHostRuntime(std::string& coreClrPath, std::string& hostRuntime
                 // Find highest 3.0.x version
                 if (!FindDotNetVersion(3, 0, hostRuntimeDirectory))
                 {
-                    // If an installed runtime can not be found, use the target coreclr version
-                    HRESULT hr = GetCoreClrDirectory(hostRuntimeDirectory);
-                    if (FAILED(hr))
+                    // Find highest 3.1.x version
+                    if (!FindDotNetVersion(3, 1, hostRuntimeDirectory))
                     {
-                        return hr;
+                        // If an installed runtime can not be found, use the target coreclr version
+                        HRESULT hr = GetCoreClrDirectory(hostRuntimeDirectory);
+                        if (FAILED(hr))
+                        {
+                            return hr;
+                        }
                     }
                 }
             }
diff --git a/src/SOS/Strike/strike.cpp b/src/SOS/Strike/strike.cpp
index 868febf6d..3dfcec200 100644
--- a/src/SOS/Strike/strike.cpp
+++ b/src/SOS/Strike/strike.cpp
@@ -7519,7 +7519,7 @@ Breakpoints g_bpoints;
 
 // If true, call the HandleRuntimeLoadedNotification function to enable the assembly load and JIT exceptions
 #ifndef FEATURE_PAL
-bool g_breakOnRuntimeModuleLoad = true;
+bool g_breakOnRuntimeModuleLoad = false;
 #endif
 
 // Controls whether optimizations are disabled on module load and whether NGEN can be used