From 5a605b31002f21dbecef7cd62be114c44cf34095 Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Tue, 21 Mar 2006 17:03:59 +0000 Subject: [PATCH] ActiveX interop files generated by MSBuild are now correctly located. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.0@1232 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Src/Project/Items/ComReferenceProjectItem.cs | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/Main/Base/Project/Src/Project/Items/ComReferenceProjectItem.cs b/src/Main/Base/Project/Src/Project/Items/ComReferenceProjectItem.cs index 8ffe120b37..8e88ec490a 100644 --- a/src/Main/Base/Project/Src/Project/Items/ComReferenceProjectItem.cs +++ b/src/Main/Base/Project/Src/Project/Items/ComReferenceProjectItem.cs @@ -110,6 +110,11 @@ namespace ICSharpCode.SharpDevelop.Project if (File.Exists(interopFileName)) { return interopFileName; } + // Look for ActiveX interop. + interopFileName = GetActiveXInteropFileName(outputFolder, Include); + if (File.Exists(interopFileName)) { + return interopFileName; + } } } catch (Exception) { } @@ -118,5 +123,13 @@ namespace ICSharpCode.SharpDevelop.Project set { } } + + static string GetActiveXInteropFileName(string outputFolder, string include) + { + if (include.ToLowerInvariant().StartsWith("ax")) { + return Path.Combine(outputFolder, String.Concat("AxInterop.", include.Substring(2), ".dll")); + } + return null; + } } }