From 1070598065ce27a3e0f71520599d1b712bf6ccd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20K=C3=A4s?= Date: Thu, 30 Jul 2015 05:48:27 +0200 Subject: [PATCH 1/2] Add support for .NET 4.6 --- .../CLRMD/ClrMemDiag/datatargetimpl.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Diagnostics.Runtime/CLRMD/ClrMemDiag/datatargetimpl.cs b/Microsoft.Diagnostics.Runtime/CLRMD/ClrMemDiag/datatargetimpl.cs index 4bd6e05..9d7a89a 100644 --- a/Microsoft.Diagnostics.Runtime/CLRMD/ClrMemDiag/datatargetimpl.cs +++ b/Microsoft.Diagnostics.Runtime/CLRMD/ClrMemDiag/datatargetimpl.cs @@ -197,7 +197,7 @@ public override ClrRuntime CreateRuntime(string dacFilename) } else if (major == 4) { - if (patch < 10000) + if (minor < 6 && patch < 10000) ver = DesktopVersion.v4; else return new V45Runtime(this, lib); From 1274a910d5753c24cbc1218877e7ed6167a42bb2 Mon Sep 17 00:00:00 2001 From: lmbrod1 Date: Tue, 1 Sep 2015 09:22:37 +0200 Subject: [PATCH 2/2] Fix NullReferenceException --- Microsoft.Diagnostics.Runtime/CLRMD/ClrMemDiag/Desktop/types.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Microsoft.Diagnostics.Runtime/CLRMD/ClrMemDiag/Desktop/types.cs b/Microsoft.Diagnostics.Runtime/CLRMD/ClrMemDiag/Desktop/types.cs index 2e5f715..3f8b64e 100644 --- a/Microsoft.Diagnostics.Runtime/CLRMD/ClrMemDiag/Desktop/types.cs +++ b/Microsoft.Diagnostics.Runtime/CLRMD/ClrMemDiag/Desktop/types.cs @@ -145,7 +145,7 @@ ClrInterface GetInterface(IMetadata import, int mdIFace) name = builder.ToString(); } - if (!m_heap.m_interfaces.TryGetValue(name, out result)) + if (name != null && !m_heap.m_interfaces.TryGetValue(name, out result)) { ClrInterface type = null; if (extends != 0 && extends != 0x01000000)