Skip to content

Commit 5c858be

Browse files
author
Konstantina Chremmou
authored
Merge pull request xenserver#3259 from danilo-delbusso/bug/launch-xencenter_CA-385151
CA-385151 & CP-45516: Fix skipped patch + Bump pipeline to v4.12
2 parents de27c12 + 903bc91 commit 5c858be

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232

3333
def XENADMIN_BRANDING_TAG = 'v5.4'
3434

35-
@Library(['PacmanSharedLibrary', "xencenter-pipeline@v4.11"])
35+
@Library(['PacmanSharedLibrary', "xencenter-pipeline@v4.12"])
3636
import com.xenserver.pipeline.xencenter.*
3737

3838
properties([

WixInstaller/wix_src.patch

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ diff -ru wixlib/ExitDialog.wxl wixlib/ExitDialog.wxl
10071007
+ <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="200" Width="220" Height="10" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
10081008
+ <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT (WixUI_InstallMode="Remove") AND XS_WixUIRMPressedOk="0"</Condition>
10091009
</Control>
1010-
diff --git wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
1010+
diff -ru wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
10111011
--- wixlib/MsiRMFilesInUse.wxs
10121012
+++ wixlib/MsiRMFilesInUse.wxs
10131013
@@ -6,10 +6,13 @@
@@ -1024,4 +1024,3 @@ diff --git wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
10241024
</Control>
10251025
<Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
10261026
<Publish Event="EndDialog" Value="Exit">1</Publish>
1027-

0 commit comments

Comments
 (0)