Kiu/xenadmin
1
0
Fork 0
mirror of https://github.com/xcp-ng/xenadmin.git synced 2024-11-21 17:11:29 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3259 from danilo-delbusso/bug/launch-xencenter_CA-385151

Browse Source 
CA-385151 & CP-45516: Fix skipped patch + Bump pipeline to v4.12
This commit is contained in:
Konstantina Chremmou 2023-11-17 10:24:48 +00:00 committed by GitHub
commit 5c858be4af
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -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([

3
WixInstaller/wix_src.patch
View File

@ -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>