Skip to content

Commit 3a303b8

Browse files
authored
Update version of MSDia and default to using shipped versions (#87782)
1 parent 2798a00 commit 3a303b8

File tree

2 files changed

+10
-19
lines changed

2 files changed

+10
-19
lines changed

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
<optimizationlinuxarm64MIBCRuntimeVersion>1.0.0-prerelease.23315.5</optimizationlinuxarm64MIBCRuntimeVersion>
162162
<optimizationPGOCoreCLRVersion>1.0.0-prerelease.23315.5</optimizationPGOCoreCLRVersion>
163163
<!-- Not auto-updated. -->
164-
<MicrosoftDiaSymReaderNativeVersion>16.11.23-beta1.23063.1</MicrosoftDiaSymReaderNativeVersion>
164+
<MicrosoftDiaSymReaderNativeVersion>16.11.27-beta1.23180.1</MicrosoftDiaSymReaderNativeVersion>
165165
<SystemCommandLineVersion>2.0.0-beta4.22564.1</SystemCommandLineVersion>
166166
<TraceEventVersion>3.0.3</TraceEventVersion>
167167
<NETStandardLibraryRefVersion>2.1.0</NETStandardLibraryRefVersion>

src/coreclr/vm/ceeload.cpp

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,26 +2261,17 @@ ISymUnmanagedReader *Module::GetISymUnmanagedReader(void)
22612261
"reachable or needs to be reimplemented for CoreCLR!");
22622262
}
22632263

2264-
// We're going to be working with Windows PDB format symbols. Attempt to CoCreate the symbol binder.
2265-
// CoreCLR supports not having a symbol reader installed, so CoCreate searches the PATH env var
2266-
// and then tries coreclr dll location.
2267-
// On desktop, the framework installer is supposed to install diasymreader.dll as well
2268-
// and so this shouldn't happen.
2269-
hr = FakeCoCreateInstanceEx(CLSID_CorSymBinder_SxS, NATIVE_SYMBOL_READER_DLL, IID_ISymUnmanagedBinder, (void**)&pBinder, NULL);
2264+
PathString symbolReaderPath;
2265+
hr = GetClrModuleDirectory(symbolReaderPath);
22702266
if (FAILED(hr))
22712267
{
2272-
PathString symbolReaderPath;
2273-
hr = GetClrModuleDirectory(symbolReaderPath);
2274-
if (FAILED(hr))
2275-
{
2276-
RETURN (NULL);
2277-
}
2278-
symbolReaderPath.Append(NATIVE_SYMBOL_READER_DLL);
2279-
hr = FakeCoCreateInstanceEx(CLSID_CorSymBinder_SxS, symbolReaderPath.GetUnicode(), IID_ISymUnmanagedBinder, (void**)&pBinder, NULL);
2280-
if (FAILED(hr))
2281-
{
2282-
RETURN (NULL);
2283-
}
2268+
RETURN (NULL);
2269+
}
2270+
symbolReaderPath.Append(NATIVE_SYMBOL_READER_DLL);
2271+
hr = FakeCoCreateInstanceEx(CLSID_CorSymBinder_SxS, symbolReaderPath.GetUnicode(), IID_ISymUnmanagedBinder, (void**)&pBinder, NULL);
2272+
if (FAILED(hr))
2273+
{
2274+
RETURN (NULL);
22842275
}
22852276

22862277
LOG((LF_CORDB, LL_INFO10, "M::GISUR: Created binder\n"));

0 commit comments

Comments
 (0)