From be5f737475054c1b1b893d8f4efb5ea3d9030ae1 Mon Sep 17 00:00:00 2001
From: WojciechRynczuk <wojciech.rynczuk@wp.pl>
Date: Tue, 18 Dec 2018 18:25:51 +0100
Subject: [PATCH] #57 New version

---
 windows/Bootstrapper/Bundle.wxs |  2 +-
 windows/Installer/Product.wxs   | 14 +++++++-------
 windows/Installer/guid_list.txt | 21 ++++++++++++---------
 windows/Installer/version.wxi   |  2 +-
 4 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/windows/Bootstrapper/Bundle.wxs b/windows/Bootstrapper/Bundle.wxs
index 544c995..0f7b71a 100644
--- a/windows/Bootstrapper/Bundle.wxs
+++ b/windows/Bootstrapper/Bundle.wxs
@@ -5,7 +5,7 @@
      xmlns:util="http://schemas.microsoft.com/wix/UtilExtension"
      xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
   <!-- Can be added to bundle to change the installation icon: IconSourceFile="..\Installer\resources\vcdMaker128.ico"-->
-	<Bundle Name="vcdMaker $(var.ProductVersionInfo)" Version="3.0.1.0" Manufacturer="vcdMaker team" UpgradeCode="aa694554-90fe-4f5b-b432-1373894aa8da">
+	<Bundle Name="vcdMaker $(var.ProductVersionInfo)" Version="3.0.2.0" Manufacturer="vcdMaker team" UpgradeCode="aa694554-90fe-4f5b-b432-1373894aa8da">
     <BootstrapperApplicationRef Id="WixStandardBootstrapperApplication.RtfLicense">
       <Payload SourceFile="resources\bootstrapper_logo.png"/>
       <bal:WixStandardBootstrapperApplication
diff --git a/windows/Installer/Product.wxs b/windows/Installer/Product.wxs
index 0b3cdf7..ea84fd9 100644
--- a/windows/Installer/Product.wxs
+++ b/windows/Installer/Product.wxs
@@ -3,7 +3,7 @@
 <?define UpgradeCode="3A563016-E31D-4D93-A36B-105420BA6E57"?>
 
 <Wix xmlns='http://schemas.microsoft.com/wix/2006/wi'>
-  <Product Name='vcdMaker $(var.ProductVersionInfo)' Id='3A142969-4CD6-48F2-AB64-D44F690E7193' UpgradeCode='$(var.UpgradeCode)'
+  <Product Name='vcdMaker $(var.ProductVersionInfo)' Id='D6123246-8A68-41DB-84BE-F4F690AEC966' UpgradeCode='$(var.UpgradeCode)'
     Language='1033' Codepage='1252' Version='$(var.ProductVersion)' Manufacturer='vcdMaker team'>
 
     <Package Id='*' Keywords='vcdMaker Installer'
@@ -17,7 +17,7 @@
     <Upgrade Id='$(var.UpgradeCode)'>
     <UpgradeVersion OnlyDetect='no' Property='PREVIOUSFOUND'
         Minimum='1.0.0' IncludeMinimum='yes'
-        Maximum='3.0.1' IncludeMaximum='no' />
+        Maximum='3.0.2' IncludeMaximum='no' />
     </Upgrade>
 
     <Media Id='1' Cabinet='Install.cab' EmbedCab='yes' DiskPrompt="CD-ROM #1" />
@@ -28,25 +28,25 @@
       <Directory Id='ProgramFilesFolder' Name='PFiles'>
         <Directory Id='INSTALLDIR' Name='vcdMaker'>
 
-          <Component Id='vcdMakerExecutable' Guid='15247FDC-7EA8-4931-B96A-DD3B3926B74E'>
+          <Component Id='vcdMakerExecutable' Guid='80B54EC5-B55B-4046-BD32-7B7E2466A3D0'>
             <Environment Id='UpdatePath' Name='PATH' Action='set' Permanent='no' System='no' Part='last' Value='[INSTALLDIR]' />
             <File Id='vcdMakerEXE' Name='$(var.vcdMaker.TargetFileName)' DiskId='1' Source='$(var.vcdMaker.TargetPath)' KeyPath='yes'>
             </File>
           </Component>
 
-          <Component Id='vcdMergeExecutable' Guid='2E82E953-9A3F-4AC0-A4C0-9F352C0ACDF1'>
+          <Component Id='vcdMergeExecutable' Guid='722D9BF2-8D84-4FD7-807A-A77C852B712B'>
             <File Id='vcdMergeEXE' Name='$(var.vcdMerge.TargetFileName)' DiskId='1' Source='$(var.vcdMerge.TargetPath)' KeyPath='yes'>
             </File>
           </Component>
 
-          <Component Id='vcdMakerManual' Guid='11B39AA4-49B4-4D18-AE33-3D278BC8BE84'>
+          <Component Id='vcdMakerManual' Guid='CBBA9EBF-0FF3-4A3E-ABE5-04D7689C4456'>
             <File Id="ManualPdf" Name="Manual.pdf" Source="$(var.SolutionDir)..\..\sources\common\doc\manual.pdf" KeyPath='yes'>
               <Shortcut Id="vcdMakerManualLnk" Directory="ProgramMenuDir" Name="vcdMaker $(var.ProductVersionInfo) Manual" WorkingDirectory='INSTALLDIR' IconIndex="0" Advertise="yes" />
             </File>
           </Component>
           
           <Directory Id='SampleDir' Name='samples'>
-            <Component Id='SampleFiles' Guid='59F4E01F-5FE3-48B3-97A2-8E7808E6EED7'>
+            <Component Id='SampleFiles' Guid='DB87BE16-F437-4FB2-9A6A-07A0CDFB54EE'>
               <File Id="SampleTtx" Name="example.txt" Source="$(var.SolutionDir)..\..\sources\common\doc\examples\example.txt" KeyPath='yes'></File>
               <File Id="SampleUsr" Name="example_user.txt" Source="$(var.SolutionDir)..\..\sources\common\doc\examples\example_user.txt"></File>
               <File Id="SampleVcd" Name="example.vcd" Source="$(var.SolutionDir)..\..\sources\common\doc\examples\example.vcd"></File>
@@ -68,7 +68,7 @@
 
       <Directory Id="ProgramMenuFolder" Name="Programs">
         <Directory Id="ProgramMenuDir" Name="vcdMaker $(var.ProductVersionInfo)">
-          <Component Id="ProgramMenuDir" Guid="59CBFDEC-3666-4313-9DF6-D6B97768FFD5">
+          <Component Id="ProgramMenuDir" Guid="8A677339-2E3E-483C-B102-224988E9FDA8">
             <RemoveFolder Id='ProgramMenuDir' On='uninstall' />
             <RegistryValue Root='HKCU' Key='Software\[Manufacturer]\[ProductName]' Type='string' Value='' KeyPath='yes' />
           </Component>
diff --git a/windows/Installer/guid_list.txt b/windows/Installer/guid_list.txt
index c8aafc4..b2b608c 100644
--- a/windows/Installer/guid_list.txt
+++ b/windows/Installer/guid_list.txt
@@ -1,14 +1,14 @@
 vcdMaker:
 {3A563016-E31D-4D93-A36B-105420BA6E57} vcdMaker UpgradeCode
 
-vcdMaker 1.0:
+vcdMaker 1.0.1:
 {0E0B8006-8388-4DC6-B2A2-1EA0E6A954B7} vcdMaker ProductId
 {CF176F63-6DA4-45A6-837B-CD1AFF3F5C12} vcdMakerExecutable Component
 {82B593FF-F018-4D28-87F3-A253FE5D4F7D} vcdMakerManual Component
 {C87B5829-C991-4527-9D16-3507C907395F} SampleFiles Component
 {FE343CAE-C7B4-47DF-B133-FAAC5F90F2DF} ProgramMenuDir Component
 
-vcdMaker 2.0:
+vcdMaker 2.0.1:
 {E11FE905-A80F-4764-B77C-AC7EADDF98CE} vcdMaker ProductId
 {5A12ED7E-8977-44D3-BB79-70B7130718F2} vcdMakerExecutable Component
 {F3A2D8F6-2FE0-4CE9-9A67-C41BBF3F5824} vcdMakerManual Component
@@ -16,19 +16,22 @@ vcdMaker 2.0:
 {8CE0301F-EEC9-4696-B0E8-74F9C1942495} ProgramMenuDir Component
 {4D660398-6AB3-4B41-BD90-D77581B91A89} vcdMergeExecutable Component
 
-vcdMaker 3.0:
+vcdMaker 3.0.1:
 {3A142969-4CD6-48F2-AB64-D44F690E7193} vcdMaker ProductId
 {15247FDC-7EA8-4931-B96A-DD3B3926B74E} vcdMakerExecutable Component
 {11B39AA4-49B4-4D18-AE33-3D278BC8BE84} vcdMakerManual Component
 {59F4E01F-5FE3-48B3-97A2-8E7808E6EED7} SampleFiles Component
 {59CBFDEC-3666-4313-9DF6-D6B97768FFD5} ProgramMenuDir Component
 {2E82E953-9A3F-4AC0-A4C0-9F352C0ACDF1} vcdMergeExecutable Component
-{D6123246-8A68-41DB-84BE-F4F690AEC966}
-{80B54EC5-B55B-4046-BD32-7B7E2466A3D0}
-{CBBA9EBF-0FF3-4A3E-ABE5-04D7689C4456}
-{DB87BE16-F437-4FB2-9A6A-07A0CDFB54EE}
-{8A677339-2E3E-483C-B102-224988E9FDA8}
-{722D9BF2-8D84-4FD7-807A-A77C852B712B}
+
+vcdMaker 3.0.2:
+{D6123246-8A68-41DB-84BE-F4F690AEC966} vcdMaker ProductId
+{80B54EC5-B55B-4046-BD32-7B7E2466A3D0} vcdMakerExecutable Component
+{CBBA9EBF-0FF3-4A3E-ABE5-04D7689C4456} vcdMakerManual Component
+{DB87BE16-F437-4FB2-9A6A-07A0CDFB54EE} SampleFiles Component
+{8A677339-2E3E-483C-B102-224988E9FDA8} ProgramMenuDir Component
+{722D9BF2-8D84-4FD7-807A-A77C852B712B} vcdMergeExecutable Component
+
 {0A77D082-22B4-42BB-BD23-754C463C30F4}
 {B29D4B89-2580-4A69-BD4D-33941FD9446D}
 {7A6FB76B-45F8-4E4C-9381-399D128E6983}
diff --git a/windows/Installer/version.wxi b/windows/Installer/version.wxi
index 7e8370b..261287f 100644
--- a/windows/Installer/version.wxi
+++ b/windows/Installer/version.wxi
@@ -1,4 +1,4 @@
 <Include>
-  <?define ProductVersion="3.0.1" ?>
+  <?define ProductVersion="3.0.2" ?>
   <?define ProductVersionInfo="3.0" ?>
 </Include>