Merge pull request microsoft#302 from vancem/FixNgenLookup.7-8-17

Fix Crossgen symbol lookup.
vancem · Jul 10, 2017 · 0101237 · 0101237
2 parents f908be2 + 8c5e17d
commit 0101237
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/TraceEvent/Symbols/SymbolReader.cs b/src/TraceEvent/Symbols/SymbolReader.cs
@@ -102,7 +102,7 @@ public string FindSymbolFilePathForModule(string dllFilePath, bool ilPDB = false
                                     ret = GenerateNGenSymbolsForModule(Path.GetFullPath(dllFilePath));
                                 }
                             }
-                            m_log.WriteLine("FindSymbolFilePathForModule returns {0}", ret ?? "NULL");
+                            m_log.WriteLine("FindSymbolFilePathForModule returns {0} for {1} {2} {3} {4}", ret ?? "NULL", pdbName, pdbGuid, pdbAge, fileVersionString ?? "NULL");
                             return ret;
                         }
                         else
@@ -155,7 +155,7 @@ public string FindSymbolFilePath(string pdbFileName, Guid pdbIndexGuid, int pdbI
             if (pdbPath == null && dllFilePath != null)        // Check next to the file. 
             {
                 m_log.WriteLine("FindSymbolFilePath: Checking relative to DLL path {0}", dllFilePath);
-                string pdbPathCandidate = Path.ChangeExtension(dllFilePath, ".pdb");
+                string pdbPathCandidate = Path.Combine(Path.GetDirectoryName(dllFilePath), Path.GetFileName(pdbFileName)); 
                 if (PdbMatches(pdbPathCandidate, pdbIndexGuid, pdbIndexAge))
                     pdbPath = pdbPathCandidate;
 
@@ -164,7 +164,7 @@ public string FindSymbolFilePath(string pdbFileName, Guid pdbIndexGuid, int pdbI
                 {
                     pdbPathCandidate = Path.Combine(
                         Path.GetDirectoryName(dllFilePath), @"symbols.pri\retail\dll\" +
-                        Path.GetFileNameWithoutExtension(dllFilePath) + ".pdb");
+                        Path.GetFileName(pdbFileName));
                     if (PdbMatches(pdbPathCandidate, pdbIndexGuid, pdbIndexAge))
                         pdbPath = pdbPathCandidate;
                 }
@@ -173,7 +173,7 @@ public string FindSymbolFilePath(string pdbFileName, Guid pdbIndexGuid, int pdbI
                 {
                     pdbPathCandidate = Path.Combine(
                         Path.GetDirectoryName(dllFilePath), @"symbols\retail\dll\" +
-                        Path.GetFileNameWithoutExtension(dllFilePath) + ".pdb");
+                        Path.GetFileName(pdbFileName));
                     if (PdbMatches(pdbPathCandidate, pdbIndexGuid, pdbIndexAge))
                         pdbPath = pdbPathCandidate;
                 }