Browse Source

Update to new Cecil version, fixes exception when loading mixed-mode assemblies.

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1435 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 20 years ago
parent
commit
9f8c6209ae
  1. 5
      src/Main/Base/Project/Src/Dom/Implementations/GetClassReturnType.cs
  2. 4
      src/Main/Base/Project/Src/Services/ParserService/ProjectContentRegistry.cs

5
src/Main/Base/Project/Src/Dom/Implementations/GetClassReturnType.cs

@ -94,7 +94,10 @@ namespace ICSharpCode.SharpDevelop.Dom
get { get {
string tmp = base.Namespace; string tmp = base.Namespace;
if (tmp == "?") { if (tmp == "?") {
return fullName.Substring(0, fullName.LastIndexOf('.')); if (fullName.IndexOf('.') > 0)
return fullName.Substring(0, fullName.LastIndexOf('.'));
else
return "";
} }
return tmp; return tmp;
} }

4
src/Main/Base/Project/Src/Services/ParserService/ProjectContentRegistry.cs

@ -177,6 +177,10 @@ namespace ICSharpCode.Core
contents[pc.AssemblyFullName] = pc; contents[pc.AssemblyFullName] = pc;
} }
return pc; return pc;
} catch (Exception ex) {
WorkbenchSingleton.SafeThreadAsyncCall((Action3<string, string, string>)ShowErrorMessage,
new object[] { itemFileName, itemInclude, "Error loading assembly:\n" + ex.ToString() });
return null;
} finally { } finally {
#if DEBUG #if DEBUG
LoggingService.DebugFormatted("Loaded {0} in {1}ms", itemInclude, Environment.TickCount - time); LoggingService.DebugFormatted("Loaded {0} in {1}ms", itemInclude, Environment.TickCount - time);

Loading…
Cancel
Save