1 files changed, 24 insertions, 25 deletions

diff --git a/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs b/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs
index bfeef18f..9fb1a0e5 100644
--- a/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs
+++ b/src/wixlib/vs2008/VS2008_VSIPCC_Collection_Files_RTL.wxs
@@ -1,12 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Fragment Id="VS2008_Namespace">
     <Binary Id="BIN_435439_x86_enu" SourceFile="$(sys.SOURCEFILEDIR)\Redist\BIN_435439_x86_enu.dll" />
-    <CustomAction Id="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" BinaryKey="BIN_435439_x86_enu" DllEntry="ScheduleExtHelpPlugin" Return="ignore" />
-    <CustomAction Id="CA_ExtHelpPlugin" BinaryKey="BIN_435439_x86_enu" DllEntry="ExtHelpPluginAction" Execute="deferred" Impersonate="no" />
+    <CustomAction Id="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" DllEntry="ScheduleExtHelpPlugin" Return="ignore" BinaryRef="BIN_435439_x86_enu" />
+    <CustomAction Id="CA_ExtHelpPlugin" DllEntry="ExtHelpPluginAction" Execute="deferred" Impersonate="no" BinaryRef="BIN_435439_x86_enu" />
     
     <DirectoryRef Id="VSIPCC">
       <Component Id="VSIPCC_Reg_27501" Guid="{7C32E9FB-9C4D-416B-8ACC-9D487ED0ADBD}" KeyPath="yes">
@@ -15,33 +14,33 @@
       </Component>
       <Directory Id="vsipcc_v9.0" Name="v9.0" FileSource="$(sys.SOURCEFILEDIR)\Redist">
         <Component Id="vsipcc_collection_25097" Guid="{D419D13C-D6D8-4E2A-A3EF-B26398D36524}">
-          <File Id="FL_vsipcc_reg_hxs_86878_86878_cn_ln" Name="vsipcc_reg.hxs" KeyPath="yes" Vital="no"/>
-          <File Id="FL_vsipcc_hxc_86879_86879_cn_ln" Name="_vsipcc90.hxc" Vital="no"/>
-          <File Id="FL_vsipcc_hxt_86880_86880_cn_ln" Name="_vsipcc90.hxt" Vital="no"/>
-          <File Id="FL_vsipccALinks_hxk_86881_86881_cn_ln" Name="_ALinks.hxk" Vital="no"/>
-          <File Id="FL_vsipccBLinks_hxk_86882_86882_cn_ln" Name="_BLinks.hxk" Vital="no"/>
-          <File Id="FL_vsipccCLinks_hxk_cn_ln" Name="_CLinks.hxk" Vital="no"/>
-          <File Id="FL_vsipccFLinks_hxk_86885_86885_cn_ln" Name="_FLinks.hxk" Vital="no"/>
-          <File Id="FL_vsipccKLinks_hxk_86886_86886_cn_ln" Name="_KLinks.hxk" Vital="no"/>
-          <File Id="FL_vsipccNamedURLs_hxk_86888_86888_cn_ln" Name="_vsipcc_namedUrls.hxk" Vital="no"/>
-          <File Id="FL_vsipccSlinks_hxk_93825_93825_cn_ln" Name="_SLinks.hxk" Vital="no"/>
-          <File Id="FL_VsipCCSamples_HxK_103959_103959_cn_ln" Name="_vsipcc_samples.HxK" Vital="no"/>
+          <File Id="FL_vsipcc_reg_hxs_86878_86878_cn_ln" Name="vsipcc_reg.hxs" KeyPath="yes" Vital="no" />
+          <File Id="FL_vsipcc_hxc_86879_86879_cn_ln" Name="_vsipcc90.hxc" Vital="no" />
+          <File Id="FL_vsipcc_hxt_86880_86880_cn_ln" Name="_vsipcc90.hxt" Vital="no" />
+          <File Id="FL_vsipccALinks_hxk_86881_86881_cn_ln" Name="_ALinks.hxk" Vital="no" />
+          <File Id="FL_vsipccBLinks_hxk_86882_86882_cn_ln" Name="_BLinks.hxk" Vital="no" />
+          <File Id="FL_vsipccCLinks_hxk_cn_ln" Name="_CLinks.hxk" Vital="no" />
+          <File Id="FL_vsipccFLinks_hxk_86885_86885_cn_ln" Name="_FLinks.hxk" Vital="no" />
+          <File Id="FL_vsipccKLinks_hxk_86886_86886_cn_ln" Name="_KLinks.hxk" Vital="no" />
+          <File Id="FL_vsipccNamedURLs_hxk_86888_86888_cn_ln" Name="_vsipcc_namedUrls.hxk" Vital="no" />
+          <File Id="FL_vsipccSlinks_hxk_93825_93825_cn_ln" Name="_SLinks.hxk" Vital="no" />
+          <File Id="FL_VsipCCSamples_HxK_103959_103959_cn_ln" Name="_vsipcc_samples.HxK" Vital="no" />
         </Component>
       </Directory>
     </DirectoryRef>
     <CustomTable Id="HelpNamespace">
       <Row>
-        <Data Column="NamespaceKey">MS.VSIPCC.v90</Data>
-        <Data Column="NamespaceName">MS.VSIPCC.v90</Data>
-        <Data Column="File_Collection">FL_vsipcc_hxc_86879_86879_cn_ln</Data>
-        <Data Column="Description">VSIP Documentation</Data>
+        <Data Column="NamespaceKey" Value="MS.VSIPCC.v90" />
+        <Data Column="NamespaceName" Value="MS.VSIPCC.v90" />
+        <Data Column="File_Collection" Value="FL_vsipcc_hxc_86879_86879_cn_ln" />
+        <Data Column="Description" Value="VSIP Documentation" />
       </Row>
     </CustomTable>
     <CustomTable Id="HelpPlugin">
       <Row>
-        <Data Column="HelpNamespace_">MS.VSIPCC.v90</Data>
-        <Data Column="HelpNamespace_Parent">MS.VSCC.v90</Data>
-        <Data Column="File_HxT">FL_vsipcc_hxt_86880_86880_cn_ln</Data>
+        <Data Column="HelpNamespace_" Value="MS.VSIPCC.v90" />
+        <Data Column="HelpNamespace_Parent" Value="MS.VSCC.v90" />
+        <Data Column="File_HxT" Value="FL_vsipcc_hxt_86880_86880_cn_ln" />
         <Data Column="File_HxA" />
         <Data Column="File_ParentHxT" />
       </Row>
@@ -50,12 +49,12 @@
     <Property Id="DirectoryTable_x86" Value="DirectoryTable" />
     <Property Id="HHFilterTable" Value="HHFilterTable" />
     <InstallExecuteSequence>
-      <Custom Action="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8">Not Installed</Custom>
+      <Custom Action="CA_ScheduleExtHelpPlugin_VSCC_VSIPCC" After="CA_RegisterMicrosoftHelp.3643236F_FC70_11D3_A536_0090278A1BB8" Condition="Not Installed" />
     </InstallExecuteSequence>
 
     <ComponentGroup Id="Help2_VS2008_Namespace_Components">
-      <ComponentRef Id="VSIPCC_Reg_27501"/>
-      <ComponentRef Id="vsipcc_collection_25097"/>
+      <ComponentRef Id="VSIPCC_Reg_27501" />
+      <ComponentRef Id="vsipcc_collection_25097" />
     </ComponentGroup>
   </Fragment>
 </Wix>