[nant-commits] CVS: nant/src/NAnt.VSNet ManagedWrapperReference.cs, 1.1, 1.2

[Gert D. <dri...@us...>]

Update of /cvsroot/nant/nant/src/NAnt.VSNet
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv11020/src/NAnt.VSNet

Modified Files:
	ManagedWrapperReference.cs 
Log Message:
Fixed regression: Runtime callable wrapper was not used when generating Windows Forms control for ActiveX component that has  no Primary Interop Assembly.

Index: ManagedWrapperReference.cs
===================================================================
RCS file: /cvsroot/nant/nant/src/NAnt.VSNet/ManagedWrapperReference.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ManagedWrapperReference.cs	4 Mar 2006 10:21:10 -0000	1.1
--- ManagedWrapperReference.cs	11 Jul 2006 18:24:01 -0000	1.2
***************
*** 329,337 ****
              if (rcw == null) {
                  // if no primary interop assembly is provided for ActiveX control,
!                 // trust the fact that VS.NET uses Interop.<name of the tlbimp reference>.dll
!                 // for the imported typelibrary
                  rcw = FileUtils.CombinePaths(Parent.ObjectDir.FullName, 
!                     "Interop." + TypeLibraryName.Substring(2, TypeLibraryName.Length - 2) 
!                     + ".dll");
              }
              if (File.Exists(rcw)) {
--- 329,335 ----
              if (rcw == null) {
                  // if no primary interop assembly is provided for ActiveX control,
!                 // then use the imported type library (if available)
                  rcw = FileUtils.CombinePaths(Parent.ObjectDir.FullName, 
!                     "Interop." + TypeLibraryName + ".dll");
              }
              if (File.Exists(rcw)) {