Skip to content

Commit c52e05b

Browse files
author
Sharon Shabtai
authored
Merge pull request #297 from shabtaisharon/v_5.0.8
Prepare for v_5.0.8
2 parents 1c98c6a + 2c66831 commit c52e05b

7 files changed

Lines changed: 753 additions & 757 deletions

File tree

Builders/Windows/SetupProject/SetupProject/DsbFiles.wxs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,17 +48,17 @@
4848
<Component Win64="yes" Id="cmp18E1ACD5A0D265BA3CF5CECEA628E7BD" Guid="*">
4949
<File Id="fil6FD478A9744074740944F5F9CB9700B0" KeyPath="yes" Source="$(var.DsbPath)\ds3-utils-5.0.4.jar" />
5050
</Component>
51-
<Component Win64="yes" Id="cmp00C742AA58DEC557755F1EA063677A33" Guid="*">
52-
<File Id="fil9A963CE2FA1CCA823925EF9A1D1A1CD5" KeyPath="yes" Source="$(var.DsbPath)\dsb-api-5.0.7.jar" />
51+
<Component Win64="yes" Id="cmpC018C3332BED6873132687B3CA73BFF7" Guid="*">
52+
<File Id="fil17839E7E160B7F1DF1F860BB828B17B5" KeyPath="yes" Source="$(var.DsbPath)\dsb-api-5.0.8.jar" />
5353
</Component>
54-
<Component Win64="yes" Id="cmpF7747C20DE4FE055AC3C559B7BDBDD29" Guid="*">
55-
<File Id="fil992E39B8262BE084EAB2DA2DEBD18A46" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.7-all.jar" />
54+
<Component Win64="yes" Id="cmpEEFF4123548C9F056C16604A6D889311" Guid="*">
55+
<File Id="fil6901514287D219B5DB6CE5DF4977C616" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.8-all.jar" />
5656
</Component>
57-
<Component Win64="yes" Id="cmpCB8742CB1FAFF433A4534F1588858C10" Guid="*">
58-
<File Id="fil8D336938BF340CB411F475406BCB6209" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.7.jar" />
57+
<Component Win64="yes" Id="cmp4CF4BEA5FF7803407695A4346E9ED422" Guid="*">
58+
<File Id="fil4B06EF717EE06FC1EEE80D39139E169F" KeyPath="yes" Source="$(var.DsbPath)\dsb-gui-5.0.8.jar" />
5959
</Component>
60-
<Component Win64="yes" Id="cmp46832BDD0E0546AFED443F9BDA659BEE" Guid="*">
61-
<File Id="fil7ED31EC5011C60AE19985B42B8943053" KeyPath="yes" Source="$(var.DsbPath)\dsb-util-5.0.7.jar" />
60+
<Component Win64="yes" Id="cmp32475FAD71F711FDEA25FFBA87E64288" Guid="*">
61+
<File Id="filA1AFE2232CC61B3F247AE110A2AE8A62" KeyPath="yes" Source="$(var.DsbPath)\dsb-util-5.0.8.jar" />
6262
</Component>
6363
<Component Win64="yes" Id="cmp67C8CE44E28F997FEAC97FF167229D5B" Guid="*">
6464
<File Id="filA4B497FD8BD148D3F7E813CA3071514F" KeyPath="yes" Source="$(var.DsbPath)\error_prone_annotations-2.1.3.jar" />
@@ -209,10 +209,10 @@
209209
<ComponentRef Id="cmp5DF3C49C2723E26412193190D1A2F32A" />
210210
<ComponentRef Id="cmpA46CEC9F6230CBA23238F5C25D8E23E9" />
211211
<ComponentRef Id="cmp18E1ACD5A0D265BA3CF5CECEA628E7BD" />
212-
<ComponentRef Id="cmp00C742AA58DEC557755F1EA063677A33" />
213-
<ComponentRef Id="cmpF7747C20DE4FE055AC3C559B7BDBDD29" />
214-
<ComponentRef Id="cmpCB8742CB1FAFF433A4534F1588858C10" />
215-
<ComponentRef Id="cmp46832BDD0E0546AFED443F9BDA659BEE" />
212+
<ComponentRef Id="cmpC018C3332BED6873132687B3CA73BFF7" />
213+
<ComponentRef Id="cmpEEFF4123548C9F056C16604A6D889311" />
214+
<ComponentRef Id="cmp4CF4BEA5FF7803407695A4346E9ED422" />
215+
<ComponentRef Id="cmp32475FAD71F711FDEA25FFBA87E64288" />
216216
<ComponentRef Id="cmp67C8CE44E28F997FEAC97FF167229D5B" />
217217
<ComponentRef Id="cmp8E58DEDBF54CD1426A62D1048B23BBE6" />
218218
<ComponentRef Id="cmp9567460C94E8835F3750DD7172F39DE2" />

Builders/Windows/SetupProject/SetupProject/SetupProject.wixproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
2828
</PropertyGroup>
2929
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x64' ">
30-
<DefineConstants>Version=5.0.7;DsbPath=..\..\..\..\..\..\..\dsb-gui\build\libs;JavaPath=..\..\Java</DefineConstants>
30+
<DefineConstants>Version=5.0.8;DsbPath=..\..\..\..\..\..\..\dsb-gui\build\libs;JavaPath=..\..\Java</DefineConstants>
3131
<OutputPath>bin\$(Platform)\$(Configuration)\</OutputPath>
3232
<IntermediateOutputPath>obj\$(Platform)\$(Configuration)\</IntermediateOutputPath>
3333
<SuppressIces>ICE57</SuppressIces>
@@ -64,7 +64,7 @@ call ..\..\..\createWXSDbsFiles.bat</PreBuildEvent>
6464
</PropertyGroup>
6565
<PropertyGroup>
6666
<PostBuildEvent>rmdir ..\..\..\..\..\Java /S /Q
67-
xcopy !(TargetPath) $(SolutionDir)bin\$(TargetName)-5.0.7$(TargetExt)%2a /Y</PostBuildEvent>
67+
xcopy !(TargetPath) $(SolutionDir)bin\$(TargetName)-5.0.8$(TargetExt)%2a /Y</PostBuildEvent>
6868
</PropertyGroup>
6969
<!--
7070
To modify your build process, add your task inside one of the targets below and uncomment it.

0 commit comments

Comments
 (0)