Update of /cvsroot/wix/wix/src/votive/sdk_vs2008/common/source/csharp/project
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6964/src/votive/sdk_vs2008/common/source/csharp/project
Modified Files:
hierarchynode.cs projectnode.cs
Log Message:
RobMen: SFBUG:1653864 - fix off by 1 error in SQL String reading.
HeathS: Added support for @RequiredVersion to WiX extension elements
HeathS: Added support for attribute references in schemas
MiCarls: Add a light error when trying to put an assembly that has no strong name into
the MsiAssembly table, with "File_Application" column empty (installing to the GAC).
HeathS: Converted chm.build to chm.proj
HeathS: Added topics on bind variables and localization
BobArnso: Switch to Server 2008 SDK build of .cubs to avoid false hits on MSI
4.0 features (sfbug:1841830, sfbug:1841341).
MiCarls: Fix various exceptions related to bad file paths specified on the commandline
also, stop parsing commandline parameters when "-?" is encountered.
BobArnso: - Make the Extension element attribute-extensible
- Modernize IniFile Name/LongName in Decompiler
WixBuild: Version 3.0.3829.0
MGhazna: Implemented the ShowAllFiles feature for Votive projects.
MilenL: Fix various project properties related bugs, mostly UI fit & finish
VaraBall: Fixed Light and Lit targets authoring to pass project references.
BobArnso: - Add Error table automatically if summary info schema set to <=100
(to avoid ICE40 warning).
- Add link-time checking for IsolatedComponent table that require
MSI 1.1+ with summary info schema set to <110.
- Add link-time checking for Shortcut columns that require MSI 4.0+
with summary info schema set to <400.
- Suppress ICE66 by default: The above checks make it obsolete and it
incorrectly reports *any* Shortcut table with the MSI 4.0 columns
as a warning, even if the column values are NULL.
MiCarls: Cleaner warnings when scheduling rollback fails in SecureObjects CA
PMarcu: Fixing error when multiple instance transforms have the same Id.
Fix for instance transform generation failure when Product/@Id="*".
MiCarls: Ensure Wow64 filesystem redirection is enabled when we get the MSXML interface
BobArnso: SFBUG:1909111 - Add en-us strings to MSMQ and COM+ extensions.
Index: projectnode.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/sdk_vs2008/common/source/csharp/project/projectnode.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** projectnode.cs 11 Jan 2008 06:15:57 -0000 1.3
--- projectnode.cs 7 Mar 2008 08:34:23 -0000 1.4
***************
*** 4704,4708 ****
if (NativeMethods.IsSamePath(file, newFileName))
{
! result[0] = VSADDRESULT.ADDRESULT_Cancel;
continue;
}
--- 4704,4716 ----
if (NativeMethods.IsSamePath(file, newFileName))
{
! object isNonMemberItem = child.GetProperty((int)__VSHPROPID.VSHPROPID_IsNonMemberItem);
! if (isNonMemberItem != null && ((bool)isNonMemberItem))
! {
! result[0] = this.IncludeExistingNonMemberNode(child);
! }
! else
! {
! result[0] = VSADDRESULT.ADDRESULT_Cancel;
! }
continue;
}
***************
*** 5119,5122 ****
--- 5127,5143 ----
}
+ /// <summary>
+ /// This method helps converting any non member node into the member one.
+ /// </summary>
+ /// <param name="node">Node to be added.</param>
+ /// <returns>Returns the result of the conversion.</returns>
+ /// <remarks>This method helps including the non-member items into the project when ShowAllFiles option is enabled.
+ /// Normally, the project ignores "Add Existing Item" command if it is in ShowAllFiles mode and the non-member node
+ /// exists for the item being added. Override this method in the sub-class to alter this behavior.</remarks>
+ protected virtual VSADDRESULT IncludeExistingNonMemberNode(HierarchyNode node)
+ {
+ return VSADDRESULT.ADDRESULT_Cancel;
+ }
+
#endregion
Index: hierarchynode.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/votive/sdk_vs2008/common/source/csharp/project/hierarchynode.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** hierarchynode.cs 21 Dec 2007 13:53:26 -0000 1.2
--- hierarchynode.cs 7 Mar 2008 08:34:22 -0000 1.3
***************
*** 430,434 ****
/// </summary>
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Scc")]
! public bool ExcludeNodeFromScc
{
get
--- 430,434 ----
/// </summary>
[SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Scc")]
! public virtual bool ExcludeNodeFromScc
{
get
|
