From c0878fe66dee22922744dbee4144e9654b076bff Mon Sep 17 00:00:00 2001
From: elasota <ejlasota@gmail.com>
Date: Sun, 17 May 2020 22:23:28 -0400
Subject: [PATCH] Moved Aerofoil package defs out of the installer project to
 reduce chance of people getting bad ideas

---
 .gitignore                                    |  1 +
 ReleasePackageInstaller/Product.wxs           | 21 ++++++++++++++++++-
 .../ReleasePackageInstaller.wixproj           |  3 +++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 134e2d8..0cba2a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,3 +30,4 @@ InstallerPackages/*
 *.wixobj
 ReleasePackageInstaller/obj/*
 ReleasePackageInstaller/bin/*
+ReleasePackageInstaller/AerofoilPackageDefs.wxi
\ No newline at end of file
diff --git a/ReleasePackageInstaller/Product.wxs b/ReleasePackageInstaller/Product.wxs
index 4401c6e..a212b59 100644
--- a/ReleasePackageInstaller/Product.wxs
+++ b/ReleasePackageInstaller/Product.wxs
@@ -1,6 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<?include AerofoilPackageDefs.wxi ?>
+<!--
+    You're probably getting a build failure on this line ^^^
+    This is because the Aerofoil upgrade code is not included in this project, to prevent collision with Aerofoil's upgrade GUID.
+    To fix this, create the AerofoilPackageDefs.wxi file in the ReleasePackageInstaller project dir.  It should look like this:
+
+<?xml version="1.0" encoding="utf-8"?>
+<Include>
+  <?define AerofoilUpgradeCode="PUT A GUID HERE" ?>
+  <?define AerofoilReleaseVersion="1.0.0.0" ?>
+</Include>
+
+    DO NOT USE AEROFOIL'S UPGRADE CODE GUID FOR YOUR OWN PROJECTS, it will cause your project to be considered a version of
+    Aerofoil, causing it to either fail to install, or uninstall Aerofoil itself.
+
+    If for some reason you need to do this or insist on doing it anyway, Aerofoil's upgrade code GUID is 2ae0587c-2a5f-4299-b5a8-e6cfed7cd84c
+-->
+
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-	<Product Id="*" Name="Aerofoil" Language="1033" Version="0.2.3.0" Manufacturer="The Aerofoil Project" UpgradeCode="2ae0587c-2a5f-4299-b5a8-e6cfed7cd84c">
+  <Product Id="*" Name="Aerofoil" Language="1033" Version="$(var.AerofoilReleaseVersion)" Manufacturer="The Aerofoil Project" UpgradeCode="$(var.AerofoilUpgradeCode)">
     <Package InstallerVersion="301" Compressed="yes" InstallScope="perMachine">
     </Package>
 
diff --git a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
index 0fca61f..98f649a 100644
--- a/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
+++ b/ReleasePackageInstaller/ReleasePackageInstaller.wixproj
@@ -150,6 +150,9 @@
   <ItemGroup>
     <EmbeddedResource Include="Strings-en-us.wxl" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="AerofoilPackageDefs.wxi" />
+  </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' ">