Merge pull request xenserver#3259 from danilo-delbusso/bug/launch-xen…

…center_CA-385151 CA-385151 & CP-45516: Fix skipped patch + Bump pipeline to v4.12
CitrixChris · Nov 17, 2023 · 5c858be · 5c858be
2 parents de27c12 + 903bc91
commit 5c858be
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -32,7 +32,7 @@
 
 def XENADMIN_BRANDING_TAG = 'v5.4'
 
-@Library(['PacmanSharedLibrary', "xencenter-pipeline@v4.11"])
+@Library(['PacmanSharedLibrary', "xencenter-pipeline@v4.12"])
 import com.xenserver.pipeline.xencenter.*
 
 properties([

diff --git a/WixInstaller/wix_src.patch b/WixInstaller/wix_src.patch
@@ -1007,7 +1007,7 @@ diff -ru wixlib/ExitDialog.wxl wixlib/ExitDialog.wxl
 +                <Control Id="OptionalCheckBox" Type="CheckBox" X="135" Y="200" Width="220" Height="10" Hidden="yes" Property="WIXUI_EXITDIALOGOPTIONALCHECKBOX" CheckBoxValue="1" Text="[WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT]">
 +                    <Condition Action="show">WIXUI_EXITDIALOGOPTIONALCHECKBOXTEXT AND NOT (WixUI_InstallMode="Remove") AND XS_WixUIRMPressedOk="0"</Condition>
                  </Control>
-diff --git wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
+diff -ru wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
 --- wixlib/MsiRMFilesInUse.wxs
 +++ wixlib/MsiRMFilesInUse.wxs
 @@ -6,10 +6,13 @@
@@ -1024,4 +1024,3 @@ diff --git wixlib/MsiRMFilesInUse.wxs wixlib/MsiRMFilesInUse.wxs
                  </Control>
                  <Control Id="Cancel" Type="PushButton" X="304" Y="243" Width="56" Height="17" Cancel="yes" Text="!(loc.WixUICancel)">
                      <Publish Event="EndDialog" Value="Exit">1</Publish>
-