install should check if .Net 4.0 is installed. and release output is …

…put in package tools folder.
chocolatey · Feb 10, 2013 · 9f94d1f · 9f94d1f
1 parent ff20369
commit 9f94d1f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 5 deletions.
diff --git a/ChocolateyPackage/ChocolateyGUI/tools/Setup_ChocolateyGUI.msi b/ChocolateyPackage/ChocolateyGUI/tools/Setup_ChocolateyGUI.msi
diff --git a/ChocolateyPackage/ChocolateyGUI/tools/Setup_ChocolateyGUI.wixpdb b/ChocolateyPackage/ChocolateyGUI/tools/Setup_ChocolateyGUI.wixpdb
diff --git a/ChocolateyPackage/ChocolateyGUI/tools/cab1.cab b/ChocolateyPackage/ChocolateyGUI/tools/cab1.cab
diff --git a/Setup_ChocolateyGUI/Product.wxs b/Setup_ChocolateyGUI/Product.wxs
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="ChocolateyGUI" Language="1033" Version="0.10.0.0" Manufacturer="Baes Christiaan" UpgradeCode="f8164f91-fa5c-4789-b68c-9beb5a046655">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
+	<Product Id="*" Name="ChocolateyGUI" Language="1033" Version="0.10.0.1" Manufacturer="Baes Christiaan" UpgradeCode="f8164f91-fa5c-4789-b68d-9beb5a046655">
 		<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
-		<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+
+    <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 />
 
     <Icon Id="icon.ico" SourceFile="$(var.Chocolatey.Explorer.ProjectDir)\chocolateyicon.ico"/>

diff --git a/Setup_ChocolateyGUI/Setup_ChocolateyGUI.wixproj b/Setup_ChocolateyGUI/Setup_ChocolateyGUI.wixproj
@@ -17,8 +17,9 @@
     <DefineConstants>Debug</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>bin\$(Configuration)\</OutputPath>
+    <OutputPath>..\ChocolateyPackage\ChocolateyGUI\tools\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+    <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="Product.wxs" />
@@ -33,6 +34,12 @@
       <RefTargetDir>INSTALLFOLDER</RefTargetDir>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" />
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.