[WiX-commits] wix/src/ext/UtilExtension/wixext UtilCompiler.cs, 1.25, 1.26 UtilFinalizeHarvesterMutator.cs, 1.10, 1.11 UtilMutator.cs, 1.10, 1.11

[Rob M. <ro...@us...>]

Update of /cvsroot/wix/wix/src/ext/UtilExtension/wixext
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv22859/src/ext/UtilExtension/wixext

Modified Files:
	UtilCompiler.cs UtilFinalizeHarvesterMutator.cs UtilMutator.cs 
Log Message:
FGrohn: SFBUG:2540057 - Error installing COM+.

NSleigh: SFBUG:2533182 - initialize NAntTasks.exeDir.

NSleigh: SFBUG:2535552  - document NAntTasks.

EricStJ: SFBug:2155318 Certificate issues on Windows Vista.  Set ACL on
         private key to allow access to Administrators group.

HeathS: SFBUG:2378630  - Pyro sets bad File.Attributes for delta-patched files

HeathS: Added MoreInfoURL to the list of required propertys for PatchMetadata

RobMen: SFBUG:2530926 - PerfCounter help is required for WindowsXP, show
        warning.

v-BRoge: SFBUG:1615167 - Registry rows generated by Class element are not
         unique.

EricStJ: SFBUG:1918961, 1918949 Fix null reference exceptions in heat when
         harvesting virtual dirs.

MiCarls: Fix several IIS issues:
        - Don't get sourcepath unnecessarily
        - SFBUG:2543875 - set path for website appropriately again
        - SFBUG:2543674 - webaddress/@header stopped supporting properties
        - a rare regression caused by the fix for SFBUG #1894817

Index: UtilMutator.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/ext/UtilExtension/wixext/UtilMutator.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** UtilMutator.cs	23 Jan 2009 10:40:16 -0000	1.10
--- UtilMutator.cs	30 Jan 2009 10:56:51 -0000	1.11
***************
*** 460,464 ****
  
                          // Remove the fragment if it is empty.
!                         if (parent.Children.GetEnumerator().Current == null)
                          {
                              ((Wix.IParentElement) parent.ParentElement).RemoveChild(parent);
--- 460,464 ----
  
                          // Remove the fragment if it is empty.
!                         if (parent.Children.GetEnumerator().Current == null && parent.ParentElement != null)
                          {
                              ((Wix.IParentElement) parent.ParentElement).RemoveChild(parent);

Index: UtilFinalizeHarvesterMutator.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/ext/UtilExtension/wixext/UtilFinalizeHarvesterMutator.cs,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** UtilFinalizeHarvesterMutator.cs	23 Jan 2009 10:40:16 -0000	1.10
--- UtilFinalizeHarvesterMutator.cs	30 Jan 2009 10:56:51 -0000	1.11
***************
*** 558,561 ****
--- 558,566 ----
                                              processed = true;
                                          }
+                                         else if (registryValue.Value.EndsWith("mscoree.dll", StringComparison.InvariantCultureIgnoreCase))
+                                         {
+                                             wixClass.ForeignServer = "mscoree.dll";
+                                             processed = true;
+                                         }
                                      }
                                      else if (String.Equals(registryValue.Name, "ThreadingModel", StringComparison.OrdinalIgnoreCase))

Index: UtilCompiler.cs
===================================================================
RCS file: /cvsroot/wix/wix/src/ext/UtilExtension/wixext/UtilCompiler.cs,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** UtilCompiler.cs	18 Jan 2009 00:20:41 -0000	1.25
--- UtilCompiler.cs	30 Jan 2009 10:56:51 -0000	1.26
***************
*** 1124,1128 ****
  
                      sbIniData.AppendFormat("{0}_{1}_NAME={2}\r\n", counterName, counter.Language, counter.Name);
!                     if (null != help)
                      {
                          sbIniData.AppendFormat("{0}_{1}_HELP={2}\r\n", counterName, counter.Language, counter.Help);
--- 1124,1128 ----
  
                      sbIniData.AppendFormat("{0}_{1}_NAME={2}\r\n", counterName, counter.Language, counter.Name);
!                     if (null != counter.Help)
                      {
                          sbIniData.AppendFormat("{0}_{1}_HELP={2}\r\n", counterName, counter.Language, counter.Help);
***************
*** 1470,1473 ****
--- 1470,1478 ----
              }
  
+             if (null == help)
+             {
+                 this.Core.OnMessage(UtilWarnings.RequiredAttributeForWindowsXP(sourceLineNumbers, node.Name, "Help"));
+             }
+ 
              // find unexpected child elements
              foreach (XmlNode child in node.ChildNodes)