From 9398d135de0abe96ec4a4ec5ca177bca19da053d Mon Sep 17 00:00:00 2001
From: Elliot Sime <eksime@gmail.com>
Date: Thu, 4 May 2017 19:58:41 +0100
Subject: [PATCH] update installer, add .net 4.6.1 requirement

---
 VDesk/Properties/AssemblyInfo.cs |  2 +-
 VDeskSetup/Product.wxs           | 14 +++++++++-----
 VDeskSetup/VDeskSetup.wixproj    |  7 +++++++
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/VDesk/Properties/AssemblyInfo.cs b/VDesk/Properties/AssemblyInfo.cs
index 70aab02..3fed3b0 100644
--- a/VDesk/Properties/AssemblyInfo.cs
+++ b/VDesk/Properties/AssemblyInfo.cs
@@ -12,4 +12,4 @@
 [assembly: Guid("4b9d3f05-3f9d-4627-a463-91c7317aaed5")]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]
 
-[assembly: AssemblyVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
diff --git a/VDeskSetup/Product.wxs b/VDeskSetup/Product.wxs
index f2d2b17..5652e9f 100644
--- a/VDeskSetup/Product.wxs
+++ b/VDeskSetup/Product.wxs
@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="4b9d3f05-3f9d-4627-a463-91c7317aaed5" Name="VDesk" Language="1033" Version="1.0.2.0" Manufacturer="Elliot Sime" UpgradeCode="55bcb7af-e64d-4e3e-bd06-f6c1b273c4ba">
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
+  <Product Id="*" Name="VDesk" Language="1033" Version="!(bind.FileVersion.exe)" Manufacturer="Elliot Sime" UpgradeCode="55bcb7af-e64d-4e3e-bd06-f6c1b273c4ba">
+    <Package Id='*' Description="VDesk !(bind.FileVersion.exe) Installer" InstallerVersion="405" Compressed="yes" InstallScope="perMachine" />
+    <PropertyRef Id="NETFRAMEWORK45"/>
     
-    <Package Id='*' Description="VDesk 1.0.2 Installer" InstallerVersion="405" Compressed="yes" InstallScope="perMachine" />
-
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <Condition Message="This application requires .NET Framework 4.6.1 Please install the .NET Framework then run this installer again.">
+      <![CDATA[Installed OR (NETFRAMEWORK45 >= "#394254")]]>
+    </Condition>
+    
+    <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <MediaTemplate EmbedCab="yes" />
 
     <Feature Id="ProductFeature" Title="VDeskSetup" Level="1">
diff --git a/VDeskSetup/VDeskSetup.wixproj b/VDeskSetup/VDeskSetup.wixproj
index 66b3757..ec34d8b 100644
--- a/VDeskSetup/VDeskSetup.wixproj
+++ b/VDeskSetup/VDeskSetup.wixproj
@@ -8,6 +8,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>VDeskSetup</OutputName>
     <OutputType>Package</OutputType>
+    <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>bin\$(Configuration)\</OutputPath>
@@ -21,6 +22,12 @@
   <ItemGroup>
     <Compile Include="Product.wxs" />
   </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+  </ItemGroup>
   <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets') " />
   <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">