next attempt to add the icon back in.

chocolatey · Feb 24, 2013 · 167537b · 167537b
1 parent 45cf876
commit 167537b
Showing 1 changed file with 27 additions and 26 deletions.
diff --git a/Setup_ChocolateyGUI/Product.wxs b/Setup_ChocolateyGUI/Product.wxs
@@ -1,48 +1,49 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
   <?include ..\SharedSource\Common\CommonWixInfo.wxi ?>
-  
+
   <Product Id="*" Name="$(var.ProductName)" Language="$(var.Language)" Version="$(var.VersionNumber)" Manufacturer="$(var.Manufacturer)" UpgradeCode="f8164f91-fa5c-4789-b68d-9beb5b146155">
-		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+
 
-
     <PropertyRef Id="NETFRAMEWORK40FULL"/>
 
     <Condition Message="This application requires .NET Framework 4.0. Please install the .NET 4.0 Framework then run this installer again.">
       <![CDATA[Installed OR NETFRAMEWORK40FULL]]>
     </Condition>
-    
+
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-		<MediaTemplate />
+    <MediaTemplate />
 
-    <Icon Id="icon.ico" SourceFile="$(var.Chocolatey.Explorer.ProjectDir)\Resources\chocolateyicon.ico"/>
+    <Icon Id="icon.ico" SourceFile="$(var.Chocolatey.Explorer.ProjectDir)\chocolateyicon.ico"/>
     <Property Id="ARPPRODUCTICON" Value="icon.ico" />
-    
-		<Feature Id="ProductFeature" Title="ChocolateyGUI" Level="1">
-			<ComponentGroupRef Id="ChocolateyComponents" />
+
+    <Feature Id="ProductFeature" Title="ChocolateyGUI" Level="1">
+      <ComponentGroupRef Id="ChocolateyComponents" />
       <ComponentRef Id="ApplicationShortcut" />
     </Feature>
-	</Product>
+  </Product>
 
-	<Fragment>
-		<Directory Id="TARGETDIR" Name="SourceDir">
-			<Directory Id="ProgramFilesFolder">
-				<Directory Id="INSTALLFOLDER" Name="ChocolateyGUI" />
-			</Directory>
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLFOLDER" Name="ChocolateyGUI" />
+      </Directory>
       <Directory Id="ProgramMenuFolder">
         <Directory Id="ApplicationProgramsFolder" Name="ChocolateyGUI"/>
       </Directory>
-		</Directory>
-	</Fragment>
+    </Directory>
+  </Fragment>
 
   <Fragment>
     <DirectoryRef Id="ApplicationProgramsFolder">
       <Component Id="ApplicationShortcut" Guid="{4747347F-5DBC-44C6-A56A-AA9473606DEC}">
         <Shortcut Id="ApplicationStartMenuShortcut"
-             Name="ChocolateyGUI"
-           Description="GUI for chocolatey"
-            Target="[INSTALLFOLDER]ChocolateyGUI.exe"
-                  WorkingDirectory="INSTALLFOLDER"/>
+              Name="ChocolateyGUI"
+              Description="GUI for chocolatey"
+              Target="[INSTALLFOLDER]ChocolateyGUI.exe"
+              WorkingDirectory="INSTALLFOLDER"
+              Icon ="icon.ico"/>
         <Shortcut Id="Uninstall"
                           Name="Uninstall ChocolateyGUI"
                           Description="Uninstalls ChocolateyGUI"
@@ -53,13 +54,13 @@
       </Component>
     </DirectoryRef>
   </Fragment>
-  
-  
+
+
   <Fragment>
-		<ComponentGroup Id="ChocolateyComponents" Directory="INSTALLFOLDER">
+    <ComponentGroup Id="ChocolateyComponents" Directory="INSTALLFOLDER">
       <Component Id="ChocolateyGUI.exe" Guid="f8164f91-fa5c-0001-0001-9beb5a044699">
         <File Id="ChocolateyGUI.exe" Source="$(var.Chocolatey.Explorer.TargetPath)" KeyPath="yes" Checksum="yes"/>
-			</Component>
+      </Component>
       <Component Id="NLog.dll" Guid="f8164f91-fa5c-0002-0002-9beb5a044699">
         <File Id="NLog.dll" Source="$(var.Chocolatey.Explorer.TargetDir)\NLog.dll" KeyPath="yes"/>
       </Component>
@@ -80,5 +81,5 @@
       </Component>
 
     </ComponentGroup>
-	</Fragment>
+  </Fragment>
 </Wix>