modified .wixproj and .wxs files to transfer .net assembly version in…

…to .msi file
rstms · Jul 10, 2015 · 06d8b33 · 06d8b33
1 parent e3f3557
commit 06d8b33
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 22 deletions.
diff --git a/PDFEncrypt/AboutBox.Designer.cs b/PDFEncrypt/AboutBox.Designer.cs
diff --git a/PDFEncrypt/AboutBox.cs b/PDFEncrypt/AboutBox.cs
@@ -26,7 +26,9 @@ public AboutBox()
                 + "see http://qpdf.sourceforge.net for details.";
 
             this.textLicense.Text = "The MIT License (MIT)\r\n"
+                + "\r\n"
                 + "Copyright (c) 2015 Reliance Systems, Inc. <mkrueger@rstms.net>\r\n"
+                + "\r\n"
                 + "Permission is hereby granted, free of charge, to any person obtaining a copy\r\n"
                 + "of this software and associated documentation files (the \"Software\"), to deal\r\n"
                 + "in the Software without restriction, including without limitation the rights\r\n"

diff --git a/Setup_PDFEncrypt/PDFEncryptSetup.wixproj b/Setup_PDFEncrypt/PDFEncryptSetup.wixproj
@@ -86,13 +86,14 @@
     <CreateItem Include="@(WSXFileList)" Condition="Exists('%(WSXFileList.Identity)')">
       <Output TaskParameter="Include" ItemName="Compile" />
     </CreateItem>
-  </Target>
-  <!--
-	To modify your build process, add your task inside one of the targets below and uncomment it.
-	Other similar extension points exist, see Wix.targets.
-	<Target Name="BeforeBuild">
+    <GetAssemblyIdentity AssemblyFiles="..\PDFEncrypt\bin\$(Configuration)\PDFEncrypt.exe">
+      <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
+    </GetAssemblyIdentity>
+    <!-- Store the assembly version number in ProductVersion preprocessor variable -->
+    <CreateProperty Value="$(DefineConstants);ProductVersion=%(AsmInfo.Version)">
+      <Output TaskParameter="Value" PropertyName="DefineConstants" />
+    </CreateProperty>
 	</Target>
 	<Target Name="AfterBuild">
 	</Target>
-	-->
 </Project>
diff --git a/Setup_PDFEncrypt/Product.wxs b/Setup_PDFEncrypt/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="Setup_PDFEncrypt" Language="1033" Version="1.0.0.0" Manufacturer="Reliance Systems, Inc." UpgradeCode="0bb3de49-cd73-4d22-a691-f57fad945d11">
+  <Product Id="*" Name="Setup_PDFEncrypt" Language="1033" Version="$(var.ProductVersion)" Manufacturer="Reliance Systems, Inc." UpgradeCode="0bb3de49-cd73-4d22-a691-f57fad945d11">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <MediaTemplate EmbedCab="yes" />

diff --git a/Setup_PDFEncrypt/bin/Release/PDFEncrypt_Setup.msi b/Setup_PDFEncrypt/bin/Release/PDFEncrypt_Setup.msi