From 4996f567bc25ccac615c97a96e616a9070d59779 Mon Sep 17 00:00:00 2001
From: Danilo Del Busso <danilo.delbusso@cloud.com>
Date: Thu, 16 Nov 2023 13:58:46 +0000
Subject: [PATCH 1/2] CA-385151: Fix skipped `MsiRMFilesInUse` patch

The patch was skipped, and the "Launch XenCenter" button did not show anymore. This was because the custom property `XS_WixUIRMPressedOk` is defined within the patch.

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
---
 WixInstaller/wix_src.patch | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/WixInstaller/wix_src.patch b/WixInstaller/wix_src.patch
index 863068f4c..e0193bcaa 100644
--- 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>
- 
\ No newline at end of file

From 903bc9149dc65b460422d691002a377c92181a09 Mon Sep 17 00:00:00 2001
From: Danilo Del Busso <danilo.delbusso@cloud.com>
Date: Thu, 16 Nov 2023 14:04:40 +0000
Subject: [PATCH 2/2] CP-45516: Bump pipeline to `v4.12`

Signed-off-by: Danilo Del Busso <danilo.delbusso@cloud.com>
---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 452c8e03a..5b9010eb5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -32,7 +32,7 @@
 
 def XENADMIN_BRANDING_TAG = 'v5.3'
 
-@Library(['PacmanSharedLibrary', "xencenter-pipeline@v4.11"])
+@Library(['PacmanSharedLibrary', "xencenter-pipeline@v4.12"])
 import com.xenserver.pipeline.xencenter.*
 
 properties([