From 26fe065d3a27e9e82bd64912ad236bf0fe7cabc4 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Sat, 24 Dec 2005 14:52:30 +0000 Subject: [PATCH] When checking the project's references, after a control has been dropped onto a form in the designer, the code now ensures that the referenced assembly exists before trying to retrieve the assembly name. If it does not exist the code tries the GAC. This handles the case where the HintPath has been set to a folder which does not exist. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@937 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../FormsDesigner/Project/Src/ToolboxProvider.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs index 502272bac1..81cead8007 100644 --- a/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs +++ b/src/AddIns/DisplayBindings/FormsDesigner/Project/Src/ToolboxProvider.cs @@ -187,7 +187,7 @@ namespace ICSharpCode.FormsDesigner if (referenceItem != null) { if (referenceItem.ItemType == ItemType.Reference) { LoggingService.Debug("Checking project reference: " + referenceItem.Include); - if (referenceItem.HintPath.Length > 0) { + if (referenceItem.HintPath.Length > 0 && File.Exists(referenceItem.FileName)) { LoggingService.Debug("Checking assembly reference"); AssemblyName assemblyName = AssemblyName.GetAssemblyName(referenceItem.FileName); if (assemblyName != null && assemblyName.FullName == referenceName.FullName) { @@ -199,7 +199,7 @@ namespace ICSharpCode.FormsDesigner if (referenceItem.Include == referenceName.FullName || referenceItem.Include == referenceName.Name) { LoggingService.Debug("Found existing GAC reference"); isAlreadyInRefFolder = true; - break; + break; } } }