Browse Source

Fix forms designer error when non .NET assembly referenced by project.

pull/62/merge
Matt Ward 12 years ago
parent
commit
2c6d2f6468
  1. 12
      src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs

12
src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs

@ -175,7 +175,7 @@ namespace ICSharpCode.FormsDesigner @@ -175,7 +175,7 @@ namespace ICSharpCode.FormsDesigner
LoggingService.Debug("Checking project reference: " + referenceItem.Include);
if (referenceItem.HintPath.Length > 0 && File.Exists(referenceItem.FileName)) {
LoggingService.Debug("Checking assembly reference");
AssemblyName assemblyName = AssemblyName.GetAssemblyName(referenceItem.FileName);
AssemblyName assemblyName = GetAssemblyName(referenceItem.FileName);
if (assemblyName != null && assemblyName.FullName == referenceName.FullName) {
isAlreadyInRefFolder = true;
break;
@ -194,6 +194,16 @@ namespace ICSharpCode.FormsDesigner @@ -194,6 +194,16 @@ namespace ICSharpCode.FormsDesigner
return isAlreadyInRefFolder;
}
static AssemblyName GetAssemblyName(string fileName)
{
try {
return AssemblyName.GetAssemblyName(fileName);
} catch (Exception ex) {
LoggingService.Debug(ex.ToString());
}
return null;
}
static void AddReferenceToProject(IProject project, AssemblyName referenceName)
{
LoggingService.Warn("Adding reference to project: " + referenceName.FullName);

Loading…
Cancel
Save