glm94/advertising-profit-control
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Updated the Wix installer to automatically grab the application core's version number. Set the Access database to not copy, keeping it purely for legacy reasons.

Browse Source
This commit is contained in:
glm94
2017-09-26 19:50:09 -05:00
parent db555d80fe
commit 650014076a
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AdvertsingProfitControl/AdvertsingProfitControl.csproj
+1 -3
View File
@@ -288,9 +288,7 @@
</BootstrapperPackage> </BootstrapperPackage>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Include="APCDatabase.accdb"> <Content Include="APCDatabase.accdb" />
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<Content Include="APCDatabase Template Script.sql" /> <Content Include="APCDatabase Template Script.sql" />
<Content Include="libeay32.dll"> <Content Include="libeay32.dll">
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
SetupProject/Product.wxs
+8 -15
View File
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product Id="*" Name="Advertising Profit Control" Language="1033" Version="3.0.0.0" Manufacturer="Garritt McCune" UpgradeCode="a416a558-d7c0-4f24-8b1e-2d01761ad15f"> <?define ProductVersion=!(bind.FileVersion.main) ?>
<Product Id="*" Name="Advertising Profit Control" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Garritt McCune" UpgradeCode="a416a558-d7c0-4f24-8b1e-2d01761ad15f">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Description="Custom Profit Control Recording Software" Comments="Profit Control Recording Software"/> <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" Description="Custom Profit Control Recording Software" Comments="Profit Control Recording Software"/>
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
<!--Not set by default, EmbedCab="yes" embeds the cabinet file into the installer--> <!--Not set by default, EmbedCab="yes" embeds the cabinet file into the installer-->
@@ -60,21 +61,19 @@
<Directory Id="ProgramMenuFolder"> <Directory Id="ProgramMenuFolder">
<Directory Id="ApplicationProgramsFolder" Name="Advertising Profit Control"/> <Directory Id="ApplicationProgramsFolder" Name="Advertising Profit Control"/>
</Directory> </Directory>
<!--App data folder-->
<!--<Directory Id="LocalAppDataFolder">
<Directory Id="LoggingFolder" Name="APC" />
</Directory> -->
</Directory> </Directory>
</Fragment> </Fragment>
<!--Define the shortcut--> <!--Define the shortcut-->
<Fragment> <Fragment>
<DirectoryRef Id="ApplicationProgramsFolder"> <DirectoryRef Id="ApplicationProgramsFolder">
<Component Id="ApplicationShortcut" Guid="*"> <Component Id="ApplicationShortcut" Guid="*">
<!--https://stackoverflow.com/questions/11776023/advertised-shortcuts-vs-non-advertised-shortcuts-in-windows-setup-project
The above link describes the difference between advertised and non-advertised links.-->
<Shortcut Id="ApplicationStartMenuShortcut" <Shortcut Id="ApplicationStartMenuShortcut"
Name="Advertising Profit Control" Name="Advertising Profit Control"
Description="Profit Control Recording Software" Description="Profit Control Recording Software"
Target="[#AdvertsingProfitControl.exe]" Target="[TARGETDIR]AdvertsingProfitControl.exe"
WorkingDirectory="APPLICATIONROOTDIRECTORY"/> WorkingDirectory="TARGETDIR"/>
<RemoveFolder Id="CleanUpShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/> <RemoveFolder Id="CleanUpShortCut" Directory="ApplicationProgramsFolder" On="uninstall"/>
<RegistryValue Root="HKCU" Key="Software\Microsoft\AdvertsingProfitControl" Name="installed" Type="integer" Value="1" KeyPath="yes"/> <RegistryValue Root="HKCU" Key="Software\Microsoft\AdvertsingProfitControl" Name="installed" Type="integer" Value="1" KeyPath="yes"/>
</Component> </Component>
@@ -84,18 +83,12 @@
<Fragment> <Fragment>
<ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER"> <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
<Component Id="AdvertisingProfitControl.exe"> <Component Id="AdvertisingProfitControl.exe">
<File Source="$(var.AdvertsingProfitControl.TargetPath)" /> <File Id="main" Source="$(var.AdvertsingProfitControl.TargetPath)" />
</Component> </Component>
<!--Mark all needed DLLs and configuration files to be installed in the directory with the main binary.--> <!--Mark all needed DLLs and configuration files to be installed in the directory with the main binary.-->
<Component Id="AppConfig"> <Component Id="AppConfig">
<File Name="AdvertsingProfitControl.exe.config" Source="$(var.SolutionDir)\AdvertsingProfitControl\App.config"/> <File Name="AdvertsingProfitControl.exe.config" Source="$(var.SolutionDir)\AdvertsingProfitControl\App.config"/>
</Component> </Component>
<!--<Component Id="HTMLRender">
<File Source="$(var.SolutionDir)\packages\HtmlRenderer.WinForms.1.5.0.6\lib\net45\HtmlRenderer.WinForms.dll"/>
</Component>
<Component Id="HTMLRenderCore">
<File Source="$(var.SolutionDir)\packages\HtmlRenderer.Core.1.5.0.6\lib\net45\HtmlRenderer.dll"/>
</Component>-->
<Component Id="EntityFrameworkDll"> <Component Id="EntityFrameworkDll">
<File Source="$(var.SolutionDir)\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll"/> <File Source="$(var.SolutionDir)\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll"/>
</Component> </Component>
@@ -126,7 +119,7 @@
</Component> </Component>
<!--Pechkin--> <!--Pechkin-->
<Component Id="Pechkin"> <Component Id="Pechkin">
<File Source="$(var.SolutionDir)packages\Pechkin.0.5.8.1\lib\net40\Pechkin.dll"/> <File Source="$(var.SolutionDir)packages\Pechkin.0.5.8.1\lib\net40\Pechkin.dll" xml:lang="en-us"/>
</Component> </Component>
<!--Common logging --> <!--Common logging -->
<Component Id="CommonCore"> <Component Id="CommonCore">