From 6a52322035f933d4a297c6ea568263b8aadf10b7 Mon Sep 17 00:00:00 2001
From: Danilo Del Busso <Danilo.Del.Busso@citrix.com>
Date: Fri, 31 Dec 2021 12:14:56 +0000
Subject: [PATCH] CP-38530: Remove PuTTY from build scripts and wix installer

Signed-off-by: Danilo Del Busso <Danilo.Del.Busso@citrix.com>
---
 WixInstaller/XenCenter.wxs    | 1 -
 XenAdmin/XenAdmin.csproj      | 4 +---
 scripts/deps-map.json         | 5 -----
 scripts/download_packages.ps1 | 2 +-
 scripts/xenadmin-build.sh     | 1 -
 5 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/WixInstaller/XenCenter.wxs b/WixInstaller/XenCenter.wxs
index 746ea627a..70254ee57 100644
--- a/WixInstaller/XenCenter.wxs
+++ b/WixInstaller/XenCenter.wxs
@@ -62,7 +62,6 @@
                             <File Id="XenCenterMainEXE" Source="$(env.RepoRoot)\XenAdmin\bin\Release\$(var.BrandConsoleNoSpace)Main.exe" />
                             <File Id="XeEXE" Source="$(env.RepoRoot)\xe\bin\Release\xe.exe" />
                             <File Id="xva_verifyEXE" Source="$(env.RepoRoot)\xva_verify\bin\Release\xva_verify.exe" />
-                            <File Id="PuTTYEXE" Source="$(env.RepoRoot)\XenAdmin\bin\Release\putty.exe" />
                             <!-- config -->
                             <File Id="XenCenterMainCONFIG" Source="$(env.RepoRoot)\XenAdmin\bin\Release\$(var.BrandConsoleNoSpace)Main.exe.config" />
                             <!-- DLLs -->
diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj
index 29925c926..421227edc 100755
--- a/XenAdmin/XenAdmin.csproj
+++ b/XenAdmin/XenAdmin.csproj
@@ -6795,8 +6795,6 @@
   </Target>
   -->
   <PropertyGroup>
-    <PostBuildEvent>copy "$(ProjectDir)\ReportViewer\resource_report.rdlc" "$(TargetDir)"
-
-copy "$(ProjectDir)\..\packages\putty.exe" "$(TargetDir)"</PostBuildEvent>
+    <PostBuildEvent>copy "$(ProjectDir)\ReportViewer\resource_report.rdlc" "$(TargetDir)"</PostBuildEvent>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/scripts/deps-map.json b/scripts/deps-map.json
index 4c727ba8a..a8ee03ae5 100644
--- a/scripts/deps-map.json
+++ b/scripts/deps-map.json
@@ -5,11 +5,6 @@
       "target": "xenadmin.git/packages/",
       "flat": "true"
     },
-    {
-      "pattern": "@REMOTE_DOTNET@/putty.exe",
-      "target": "xenadmin.git/packages/",
-      "flat": "true"
-    },
     {
       "pattern": "@REMOTE_DOTNET@/dotnet48/CookComputing.XmlRpcV2.dll",
       "target": "xenadmin.git/packages/",
diff --git a/scripts/download_packages.ps1 b/scripts/download_packages.ps1
index 9e5f68337..cd0ea9865 100644
--- a/scripts/download_packages.ps1
+++ b/scripts/download_packages.ps1
@@ -65,7 +65,7 @@ foreach ($dep in $DEPS_MAP.files) {
         Invoke-WebRequest -Uri $pattern -Method Get -OutFile "$PACKAGE_DIR\$symbolfile"
     }
 
-    if (($filename -eq "putty.exe") -or ($filename -like "*.dll") -or (($filename -like "*.zip") -and $ZIP)) {
+    if (($filename -like "*.dll") -or (($filename -like "*.zip") -and $ZIP)) {
         Write-Output "Downloading $filename"
         Invoke-WebRequest -Uri $pattern -Method Get -OutFile "$PACKAGE_DIR\$filename"
     }
diff --git a/scripts/xenadmin-build.sh b/scripts/xenadmin-build.sh
index eee81c806..d31346812 100644
--- a/scripts/xenadmin-build.sh
+++ b/scripts/xenadmin-build.sh
@@ -104,7 +104,6 @@ if [ -f "${SIGN_BAT}" ] ; then
   cd ${REPO}/XenAdmin/bin/Release && ${SIGN_BAT} ICSharpCode.SharpZipLib.dll "SharpZipLib"
   cd ${REPO}/XenAdmin/bin/Release && ${SIGN_BAT} DiscUtils.dll "DiscUtils"
   cd ${REPO}/XenAdmin/bin/Release && ${SIGN_BAT} Ionic.Zip.dll "OSS"
-  cd ${REPO}/XenAdmin/bin/Release && ${SIGN_BAT} putty.exe "PuTTY"
 
   cd ${REPO}/XenServerHealthCheck/bin/Release && ${SIGN_BAT} XenServerHealthCheck.exe "${BRANDING_BRAND_CONSOLE}"
 else