diff --git a/Binaries/Archive/NetExt-2.1.60.5000.zip b/Binaries/Archive/NetExt-2.1.60.5000.zip new file mode 100644 index 00000000..a1c45ef5 Binary files /dev/null and b/Binaries/Archive/NetExt-2.1.60.5000.zip differ diff --git a/Binaries/Archive/NetExt-2.1.61.5000.zip b/Binaries/Archive/NetExt-2.1.61.5000.zip new file mode 100644 index 00000000..ab008290 Binary files /dev/null and b/Binaries/Archive/NetExt-2.1.61.5000.zip differ diff --git a/Binaries/NetExt-2.1.62.5000.zip b/Binaries/NetExt-2.1.62.5000.zip new file mode 100644 index 00000000..a9c0ed85 Binary files /dev/null and b/Binaries/NetExt-2.1.62.5000.zip differ diff --git a/Binaries/README.md b/Binaries/README.md index 9e1c0cae..74f6449e 100644 Binary files a/Binaries/README.md and b/Binaries/README.md differ diff --git a/Binaries/x64/NetExt.dll b/Binaries/x64/NetExt.dll index 7b0fb0b3..a8295efd 100644 Binary files a/Binaries/x64/NetExt.dll and b/Binaries/x64/NetExt.dll differ diff --git a/Binaries/x64/NetExt.pdb b/Binaries/x64/NetExt.pdb index 5b813fb3..05a1a0e4 100644 Binary files a/Binaries/x64/NetExt.pdb and b/Binaries/x64/NetExt.pdb differ diff --git a/Binaries/x64/NetExtShim.dll b/Binaries/x64/NetExtShim.dll index e12a651d..c01505b7 100644 Binary files a/Binaries/x64/NetExtShim.dll and b/Binaries/x64/NetExtShim.dll differ diff --git a/Binaries/x64/NetExtShim.pdb b/Binaries/x64/NetExtShim.pdb index e69d4d57..6866daf4 100644 Binary files a/Binaries/x64/NetExtShim.pdb and b/Binaries/x64/NetExtShim.pdb differ diff --git a/Binaries/x86/NetExt.dll b/Binaries/x86/NetExt.dll index 0e8dd96a..514c7d34 100644 Binary files a/Binaries/x86/NetExt.dll and b/Binaries/x86/NetExt.dll differ diff --git a/Binaries/x86/NetExtShim.dll b/Binaries/x86/NetExtShim.dll index 1a3f1621..30d174b9 100644 Binary files a/Binaries/x86/NetExtShim.dll and b/Binaries/x86/NetExtShim.dll differ diff --git a/ClrMemDiagExt/COMInterop.cs b/ClrMemDiagExt/COMInterop.cs index dbd62eb9..b66cb9ed 100644 --- a/ClrMemDiagExt/COMInterop.cs +++ b/ClrMemDiagExt/COMInterop.cs @@ -3223,7 +3223,20 @@ public int CreateRuntimeFromIXCLR(object ixCLRProcess, out IMDRuntime ppRuntime) if (m_target == null || m_target.ClrVersions == null) return HRESULTS.E_FAIL; - + if (m_target.ClrVersions.Count == 1) + { + try + { + DebugApi.Runtime = m_target.ClrVersions[0].CreateRuntime(ixCLRProcess); + ppRuntime = new MDRuntime(DebugApi.Runtime); + runTimeIndex = 0; + Runtimes = new List(); + Runtimes.Add(DebugApi.Runtime); + return HRESULTS.S_OK; + } + catch + { } + } if (runTimeIndex != -1 && runTimeIndex < m_target.ClrVersions.Count) { #if DEBUG diff --git a/ClrMemDiagExt/Microsoft.Diagnostics.Runtime/Utilities/SymbolLocator.cs b/ClrMemDiagExt/Microsoft.Diagnostics.Runtime/Utilities/SymbolLocator.cs index de895f97..3e587bef 100644 --- a/ClrMemDiagExt/Microsoft.Diagnostics.Runtime/Utilities/SymbolLocator.cs +++ b/ClrMemDiagExt/Microsoft.Diagnostics.Runtime/Utilities/SymbolLocator.cs @@ -615,7 +615,10 @@ private string GetPhysicalFileFromServer(string serverPath, string pdbIndexPath, var fullDestPath = Path.Combine(symbolCacheDir, pdbIndexPath); if (File.Exists(fullDestPath)) return fullDestPath; - + // replace .dl_ by .dll + //var fullDestPathNoZip = fullDestPath.Substring(0, fullDestPath.Length - 1) + "l"; + //if (File.Exists(fullDestPathNoZip)) + // return fullDestPathNoZip; if (serverPath.StartsWith("http:")) { var fullUri = serverPath + "/" + pdbIndexPath.Replace('\\', '/'); diff --git a/ClrMemDiagExt/Microsoft.Diagnostics.Runtime/datatarget.cs b/ClrMemDiagExt/Microsoft.Diagnostics.Runtime/datatarget.cs index 2e31c40f..9201599b 100644 --- a/ClrMemDiagExt/Microsoft.Diagnostics.Runtime/datatarget.cs +++ b/ClrMemDiagExt/Microsoft.Diagnostics.Runtime/datatarget.cs @@ -1111,13 +1111,13 @@ private ClrInfo[] InitVersions() break; } - string dacLocation = Path.Combine(Path.GetDirectoryName(module.FileName), DacInfo.GetDacFileName(flavor, Architecture)); + string dacLocation = Path.Combine(Path.GetDirectoryName(module.FileName), DacInfo.GetDacFileName(flavor, IntPtr.Size == 4 ? Architecture.X86 : Architecture.Amd64)); if (!File.Exists(dacLocation) || !NativeMethods.IsEqualFileVersion(dacLocation, module.Version)) dacLocation = null; VersionInfo version = module.Version; string dacAgnosticName = DacInfo.GetDacRequestFileName(flavor, Architecture, Architecture, version); - string dacFileName = DacInfo.GetDacRequestFileName(flavor, IntPtr.Size == 4 ? Architecture.X86 : Architecture.Amd64, Architecture, version); + string dacFileName = DacInfo.GetDacRequestFileName(flavor, IntPtr.Size == 4 ? Architecture.X86 : Architecture.Amd64, IntPtr.Size == 4 ? Architecture.X86 : Architecture.Amd64, version); DacInfo dacInfo = new DacInfo(_dataReader, dacAgnosticName, Architecture) { diff --git a/ClrMemDiagExt/Properties/AssemblyInfo.cs b/ClrMemDiagExt/Properties/AssemblyInfo.cs index 4f783698..1f3fb037 100644 --- a/ClrMemDiagExt/Properties/AssemblyInfo.cs +++ b/ClrMemDiagExt/Properties/AssemblyInfo.cs @@ -22,5 +22,5 @@ // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("f12c38b7-0893-4208-ab3d-54c3f8d1c01e")] -[assembly: AssemblyVersion("2.1.61.5000")] -[assembly: AssemblyFileVersion("2.1.61.5000")] \ No newline at end of file +[assembly: AssemblyVersion("2.1.62.5000")] +[assembly: AssemblyFileVersion("2.1.62.5000")] \ No newline at end of file diff --git a/NetExt/NetExt.cpp b/NetExt/NetExt.cpp index ba3893d2..5ef09415 100644 --- a/NetExt/NetExt.cpp +++ b/NetExt/NetExt.cpp @@ -403,7 +403,7 @@ HRESULT INIT_API() HRESULT hr = S_OK; if(pTarget != NULL) hr = E_APPLICATION_ACTIVATION_EXEC_FAILURE; - EXITPOINTEXT("Init was performed but it could not start CLR"); + EXITPOINTEXT("Init was performed but it could not start CLR\nTry running .cordll -l"); if(!clrData) { @@ -413,7 +413,7 @@ HRESULT INIT_API() } if(!clrData) hr=E_APPLICATION_ACTIVATION_EXEC_FAILURE; - EXITPOINTEXT("Unable to acquire .NET debugger interface"); + EXITPOINTEXT("Unable to acquire .NET debugger interface\nTry running .cordll -l"); using namespace NetExtShim; ::CoInitialize(NULL); diff --git a/NetExt/Release32/CL.read.1.tlog b/NetExt/Release32/CL.read.1.tlog index d888c8ca..169e7dcf 100644 Binary files a/NetExt/Release32/CL.read.1.tlog and b/NetExt/Release32/CL.read.1.tlog differ diff --git a/NetExt/Release32/NetExt.res b/NetExt/Release32/NetExt.res index 6534692e..84cb007f 100644 Binary files a/NetExt/Release32/NetExt.res and b/NetExt/Release32/NetExt.res differ diff --git a/NetExt/Release32/NetExt.write.1.tlog b/NetExt/Release32/NetExt.write.1.tlog index c87255ba..6ace756b 100644 --- a/NetExt/Release32/NetExt.write.1.tlog +++ b/NetExt/Release32/NetExt.write.1.tlog @@ -113,3 +113,8 @@ C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp +^C:\Users\rviana\OneDrive\Projects\netext\NetExt\NetExt.vcxproj +C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib +C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.lib +C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp +C:\Users\rviana\OneDrive\Projects\netext\Release32\NetExt.exp diff --git a/NetExt/VersionInfo.h b/NetExt/VersionInfo.h index 9a57f52e..dd6c22f1 100644 --- a/NetExt/VersionInfo.h +++ b/NetExt/VersionInfo.h @@ -8,7 +8,7 @@ #ifndef ver_major #define ver_major 2 #define ver_minor 1 -#define ver_release 61 +#define ver_release 62 #define ver_build 5000 #define ver_all(a,b,c,d) a,b,c,d #define ver_expand(s) #s diff --git a/README.md b/README.md index 9e1c0cae..74f6449e 100644 Binary files a/README.md and b/README.md differ diff --git a/Release32/NetExt.exp b/Release32/NetExt.exp index 87d43ae4..98ac9029 100644 Binary files a/Release32/NetExt.exp and b/Release32/NetExt.exp differ diff --git a/Release32/NetExt.lib b/Release32/NetExt.lib index 81d98ded..e867de00 100644 Binary files a/Release32/NetExt.lib and b/Release32/NetExt.lib differ diff --git a/x86/Release32/NetExt.dll b/x86/Release32/NetExt.dll index 0e8dd96a..514c7d34 100644 Binary files a/x86/Release32/NetExt.dll and b/x86/Release32/NetExt.dll differ diff --git a/x86/Release32/NetExtShim.dll b/x86/Release32/NetExtShim.dll index 1a3f1621..30d174b9 100644 Binary files a/x86/Release32/NetExtShim.dll and b/x86/Release32/NetExtShim.dll differ