WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-12-14 12:09:36 +00:00
Code Issues Projects Releases Wiki Activity

Moved Aerofoil package defs out of the installer project to reduce chance of people getting bad ideas

Browse Source
This commit is contained in:
elasota
2020-05-17 22:23:28 -04:00
parent 9c18a2ba55
commit c0878fe66d
3 changed files with 24 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -30,3 +30,4 @@ InstallerPackages/*
*.wixobj *.wixobj
ReleasePackageInstaller/obj/* ReleasePackageInstaller/obj/*
ReleasePackageInstaller/bin/* ReleasePackageInstaller/bin/*
ReleasePackageInstaller/AerofoilPackageDefs.wxi

21
ReleasePackageInstaller/Product.wxs
View File

@@ -1,6 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?> <?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"> <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 InstallerVersion="301" Compressed="yes" InstallScope="perMachine">
</Package> </Package>

3
ReleasePackageInstaller/ReleasePackageInstaller.wixproj
View File

@@ -150,6 +150,9 @@
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="Strings-en-us.wxl" /> <EmbeddedResource Include="Strings-en-us.wxl" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<Content Include="AerofoilPackageDefs.wxi" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' " /> <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') " /> <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' "> <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">