bzr commit into wex-installer-1.0 branch (reggie.burnett:277)

[Reggie Burnett]

#At file:///C:/Users/Reggie/work/wex/installer-updated/ based on revid:reggie.burnett@stripped

  277 Reggie Burnett	2011-01-31
      Fixed shortcut icon that I broke earlier

    modified:
      Setup_Net/Product.wxs
=== modified file 'Setup_Net/Product.wxs'
=== modified file 'Setup_Net/Product.wxs'
--- a/Setup_Net/Product.wxs	2011-01-31 21:14:36 +0000
+++ b/Setup_Net/Product.wxs	2011-01-31 21:36:45 +0000
@@ -15,8 +15,8 @@
       <UpgradeVersion OnlyDetect="no" Maximum="$(var.ProductVersion)" Property="OLDERVERSIONBEINGUPGRADED" IncludeMaximum="yes" />
     </Upgrade>
     <Media Id="1" Cabinet="media1.cab" EmbedCab="yes" />
-    <Icon Id="InstallerIcon" SourceFile="$(var.ProjectDir)..\WexInstaller\Resources\mysql-installer.ico"/>
-    <Property Id="ARPPRODUCTICON" Value="InstallerIcon"/>
+    <Icon Id="InstallerIcon.exe" SourceFile="$(var.ProjectDir)..\WexInstaller\Resources\mysql-installer.ico"/>
+    <Property Id="ARPPRODUCTICON" Value="InstallerIcon.exe"/>
     <Directory Id="TARGETDIR" Name="SourceDir">
       <!-- install WexInstaller.exe under ProgramFiles-->
       <Directory Id="ProgramFilesFolder">
@@ -24,7 +24,7 @@
           <Directory Id="INSTALLLOCATION" Name="MySQL Universal Installer">
             <Component Id="WexInstaller.exe" Guid="89A0E0A3-6E87-4C87-8F1D-6DC3D3D21CB4" Permanent="yes">
               <File Id="WexInstaller.exe" Name="UniversalInstaller.exe" KeyPath="yes" Source="$(var.ProjectDir)..\WexInstaller\bin\$(var.Configuration)\WexInstaller.exe">
-                <Shortcut Id="mainShortcut" Directory="ShortCutDir" Advertise="yes"
+                <Shortcut Id="mainShortcut" Directory="ShortCutDir" Advertise="yes" Icon="InstallerIcon.exe"
                           Name="MySQL Universal Installer" WorkingDirectory="INSTALLLOCATION"/>
               </File>
               <File Id="WexInstallerUpdater.exe" Name="WexInstallerUpdater.exe" 


Attachment: [text/bzr-bundle] bzr/[e-mail]