From d643e661b21d53af8f08f24112db670e4162e8b1 Mon Sep 17 00:00:00 2001
From: Sharon Shabtai <sharons@spectralogic.com>
Date: Thu, 25 Apr 2019 13:05:17 -0600
Subject: [PATCH] Prep for v5.0.9

---
 .../Windows/SetupProject/SetupProject.sln     |  1 +
 .../SetupProject/SetupProject/DsbFiles.wxs    | 48 +++++++++----------
 .../SetupProject/SetupProject.wixproj         |  4 +-
 Builders/Windows/SetupProject/Version.cs      |  4 +-
 dsb-gui/launch4j.xml                          |  2 +-
 5 files changed, 30 insertions(+), 29 deletions(-)

diff --git a/Builders/Windows/SetupProject/SetupProject.sln b/Builders/Windows/SetupProject/SetupProject.sln
index 68564a89..285391bd 100644
--- a/Builders/Windows/SetupProject/SetupProject.sln
+++ b/Builders/Windows/SetupProject/SetupProject.sln
@@ -16,6 +16,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{5A3A
 		SetupProject\createWXSDbsFiles.bat = SetupProject\createWXSDbsFiles.bat
 		..\createWXSJavaFiles.bat = ..\createWXSJavaFiles.bat
 		SetupProject\extractJava.bat = SetupProject\extractJava.bat
+		..\..\..\dsb-gui\launch4j.xml = ..\..\..\dsb-gui\launch4j.xml
 	EndProjectSection
 EndProject
 Global
diff --git a/Builders/Windows/SetupProject/SetupProject/DsbFiles.wxs b/Builders/Windows/SetupProject/SetupProject/DsbFiles.wxs
index 2e6a2494..c6866abe 100644
--- a/Builders/Windows/SetupProject/SetupProject/DsbFiles.wxs
+++ b/Builders/Windows/SetupProject/SetupProject/DsbFiles.wxs
@@ -36,29 +36,29 @@
                 <Component Win64="yes" Id="cmp415FC109CDD3A33F88D3FCC826AF1FEF" Guid="*">
                     <File Id="fil46A76ED9B51590F33C7A11C0D89AF2AF" KeyPath="yes" Source="$(var.DsbPath)\controlsfx-8.40.14.jar" />
                 </Component>
-                <Component Win64="yes" Id="cmpDE93D714782817DB859617AE576166CA" Guid="*">
-                    <File Id="fil572BAF8D484720A75218642AEBAD7002" KeyPath="yes" Source="$(var.DsbPath)\ds3-interfaces-5.0.4.jar" />
+                <Component Win64="yes" Id="cmp968BCD235F6263B020E5ECEEC7F21ECE" Guid="*">
+                    <File Id="fil49532CA96EC39E8F5CF59D6A03093AF2" KeyPath="yes" Source="$(var.DsbPath)\ds3-interfaces-5.0.5.jar" />
                 </Component>
-                <Component Win64="yes" Id="cmp5DF3C49C2723E26412193190D1A2F32A" Guid="*">
-                    <File Id="fil45FD67857BDFBAE1A697008D557155F5" KeyPath="yes" Source="$(var.DsbPath)\ds3-metadata-5.0.4.jar" />
+                <Component Win64="yes" Id="cmp68ED39CF82DE7376D7E531403EE4D6EC" Guid="*">
+                    <File Id="filA13249CEA9E893BC0DC2708CFB6AD5DA" KeyPath="yes" Source="$(var.DsbPath)\ds3-metadata-5.0.5.jar" />
                 </Component>
-                <Component Win64="yes" Id="cmpA46CEC9F6230CBA23238F5C25D8E23E9" Guid="*">
-                    <File Id="fil21975D5AECF1B9147C371ACE76C9C767" KeyPath="yes" Source="$(var.DsbPath)\ds3-sdk-5.0.4.jar" />
+                <Component Win64="yes" Id="cmpFC35B2F8620A385DE0AB2D1FC84F7F49" Guid="*">
+                    <File Id="fil94EF5BDE8F67DD647BC9FCA8402259EE" KeyPath="yes" Source="$(var.DsbPath)\ds3-sdk-5.0.5.jar" />
                 </Component>
-                <Component Win64="yes" Id="cmp18E1ACD5A0D265BA3CF5CECEA628E7BD" Guid="*">
-                    <File Id="fil6FD478A9744074740944F5F9CB9700B0" KeyPath="yes" Source="$(var.DsbPath)\ds3-utils-5.0.4.jar" />
+                <Component Win64="yes" Id="cmp8C010EFB4DCB9619A364F7266A68264A" Guid="*">
+                    <File Id="fil802A80984CA23FD923667603621D5D0C" KeyPath="yes" Source="$(var.DsbPath)\ds3-utils-5.0.5.jar" />
                 </Component>
-                <Component Win64="yes" Id="cmpC018C3332BED6873132687B3CA73BFF7" Guid="*">
-                    <File Id="fil17839E7E160B7F1DF1F860BB828B17B5" KeyPath="yes" Source="$(var.DsbPath)\dsb-api-5.0.8.jar" />
+                <Component Win64="yes" Id="cmp7D65231F51CB3D0934A21524B573F335" Guid="*">
+                    <File Id="fil35FF4A730A555D8971CDA8437160902C" KeyPath="yes" Source="$(var.DsbPath)\dsb-api-5.0.9.jar" />
                 </Component>
-                <Component Win64="yes" Id="cmpEEFF4123548C9F056C16604A6D889311" Guid="*">
-                    <File Id="fil6901514287D219B5DB6CE5DF4977C616" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.8-all.jar" />
+                <Component Win64="yes" Id="cmp9F0C0418109CA9B88EB18A20CE8468E5" Guid="*">
+                    <File Id="filC0CEAF25F3FA55619578A32859F83F73" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.9-all.jar" />
                 </Component>
-                <Component Win64="yes" Id="cmp4CF4BEA5FF7803407695A4346E9ED422" Guid="*">
-                    <File Id="fil4B06EF717EE06FC1EEE80D39139E169F" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.8.jar" />
+                <Component Win64="yes" Id="cmpF082A0354285061663E32F0D2CC08FA2" Guid="*">
+                    <File Id="filD40E67F05184C79AB46CFA807FD50EB1" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.9.jar" />
                 </Component>
-                <Component Win64="yes" Id="cmp32475FAD71F711FDEA25FFBA87E64288" Guid="*">
-                    <File Id="filA1AFE2232CC61B3F247AE110A2AE8A62" KeyPath="yes" Source="$(var.DsbPath)\dsb-util-5.0.8.jar" />
+                <Component Win64="yes" Id="cmp81832E9B00C5FF95EEFF20B0A8AEA405" Guid="*">
+                    <File Id="fil8CFAACEC5A7E7C926052357AD568E8A6" KeyPath="yes" Source="$(var.DsbPath)\dsb-util-5.0.9.jar" />
                 </Component>
                 <Component Win64="yes" Id="cmp67C8CE44E28F997FEAC97FF167229D5B" Guid="*">
                     <File Id="filA4B497FD8BD148D3F7E813CA3071514F" KeyPath="yes" Source="$(var.DsbPath)\error_prone_annotations-2.1.3.jar" />
@@ -205,14 +205,14 @@
             <ComponentRef Id="cmpCAFC8B140EF7A7F0A90AF20CCA67B467" />
             <ComponentRef Id="cmp2FD8C1740A993012CFE50DB3B08733AE" />
             <ComponentRef Id="cmp415FC109CDD3A33F88D3FCC826AF1FEF" />
-            <ComponentRef Id="cmpDE93D714782817DB859617AE576166CA" />
-            <ComponentRef Id="cmp5DF3C49C2723E26412193190D1A2F32A" />
-            <ComponentRef Id="cmpA46CEC9F6230CBA23238F5C25D8E23E9" />
-            <ComponentRef Id="cmp18E1ACD5A0D265BA3CF5CECEA628E7BD" />
-            <ComponentRef Id="cmpC018C3332BED6873132687B3CA73BFF7" />
-            <ComponentRef Id="cmpEEFF4123548C9F056C16604A6D889311" />
-            <ComponentRef Id="cmp4CF4BEA5FF7803407695A4346E9ED422" />
-            <ComponentRef Id="cmp32475FAD71F711FDEA25FFBA87E64288" />
+            <ComponentRef Id="cmp968BCD235F6263B020E5ECEEC7F21ECE" />
+            <ComponentRef Id="cmp68ED39CF82DE7376D7E531403EE4D6EC" />
+            <ComponentRef Id="cmpFC35B2F8620A385DE0AB2D1FC84F7F49" />
+            <ComponentRef Id="cmp8C010EFB4DCB9619A364F7266A68264A" />
+            <ComponentRef Id="cmp7D65231F51CB3D0934A21524B573F335" />
+            <ComponentRef Id="cmp9F0C0418109CA9B88EB18A20CE8468E5" />
+            <ComponentRef Id="cmpF082A0354285061663E32F0D2CC08FA2" />
+            <ComponentRef Id="cmp81832E9B00C5FF95EEFF20B0A8AEA405" />
             <ComponentRef Id="cmp67C8CE44E28F997FEAC97FF167229D5B" />
             <ComponentRef Id="cmp8E58DEDBF54CD1426A62D1048B23BBE6" />
             <ComponentRef Id="cmp9567460C94E8835F3750DD7172F39DE2" />
diff --git a/Builders/Windows/SetupProject/SetupProject/SetupProject.wixproj b/Builders/Windows/SetupProject/SetupProject/SetupProject.wixproj
index 3ee358e8..0fe46551 100644
--- a/Builders/Windows/SetupProject/SetupProject/SetupProject.wixproj
+++ b/Builders/Windows/SetupProject/SetupProject/SetupProject.wixproj
@@ -27,7 +27,7 @@
     <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
-    <DefineConstants>Version=5.0.8;DsbPath=..\..\..\..\..\..\..\dsb-gui\build\libs;JavaPath=..\..\Java</DefineConstants>
+    <DefineConstants>Version=5.0.9;DsbPath=..\..\..\..\..\..\..\dsb-gui\build\libs;JavaPath=..\..\Java</DefineConstants>
     <OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
     <IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
     <SuppressIces>ICE57</SuppressIces>
@@ -64,7 +64,7 @@ call ..\..\..\createWXSDbsFiles.bat</PreBuildEvent>
   </PropertyGroup>
   <PropertyGroup>
     <PostBuildEvent>rmdir ..\..\..\..\..\Java /S /Q
-xcopy !(TargetPath) $(SolutionDir)bin\$(TargetName)-5.0.8$(TargetExt)%2a /Y</PostBuildEvent>
+xcopy !(TargetPath) $(SolutionDir)bin\$(TargetName)-5.0.9$(TargetExt)%2a /Y</PostBuildEvent>
   </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/Builders/Windows/SetupProject/Version.cs b/Builders/Windows/SetupProject/Version.cs
index 366ca932..85642df6 100644
--- a/Builders/Windows/SetupProject/Version.cs
+++ b/Builders/Windows/SetupProject/Version.cs
@@ -1,4 +1,4 @@
 using System.Reflection;
 
-[assembly: AssemblyVersion("5.0.8.4")]
-[assembly: AssemblyFileVersion("5.0.8.4")]
\ No newline at end of file
+[assembly: AssemblyVersion("5.0.9.2")]
+[assembly: AssemblyFileVersion("5.0.9.2")]
\ No newline at end of file
diff --git a/dsb-gui/launch4j.xml b/dsb-gui/launch4j.xml
index 36121c41..e2c92ade 100644
--- a/dsb-gui/launch4j.xml
+++ b/dsb-gui/launch4j.xml
@@ -2,7 +2,7 @@
 <launch4jConfig>
   <dontWrapJar>false</dontWrapJar>
   <headerType>gui</headerType>
-  <jar>build\libs\dsb-gui-5.0.8.jar</jar>
+  <jar>build\libs\dsb-gui-5.0.9.jar</jar>
   <outfile>build\dsb-gui.exe</outfile>
   <errTitle></errTitle>
   <cmdLine></cmdLine>