From 2e3a8e1ccfd026ace20f6281152ca0d81a6eafd8 Mon Sep 17 00:00:00 2001
From: Shamil Mubarakshin
 <127750046+shamil-mubarakshin@users.noreply.github.com>
Date: Mon, 10 Jun 2024 08:45:22 +0200
Subject: [PATCH] [windows] Modify TortoiseSVN installation (#10010)

---
 images/windows/scripts/build/Install-TortoiseSvn.ps1 | 6 ++++++
 images/windows/templates/windows-2019.pkr.hcl        | 3 ++-
 images/windows/templates/windows-2022.pkr.hcl        | 3 ++-
 images/windows/toolsets/toolset-2019.json            | 1 -
 images/windows/toolsets/toolset-2022.json            | 1 -
 5 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 images/windows/scripts/build/Install-TortoiseSvn.ps1

diff --git a/images/windows/scripts/build/Install-TortoiseSvn.ps1 b/images/windows/scripts/build/Install-TortoiseSvn.ps1
new file mode 100644
index 000000000..48f04463c
--- /dev/null
+++ b/images/windows/scripts/build/Install-TortoiseSvn.ps1
@@ -0,0 +1,6 @@
+################################################################################
+##  File:  Install-TortoiseSvn.ps1
+##  Desc:  Install TortoiseSvn
+################################################################################
+
+Install-ChocoPackage tortoisesvn
diff --git a/images/windows/templates/windows-2019.pkr.hcl b/images/windows/templates/windows-2019.pkr.hcl
index 9c734d633..09acf8da3 100644
--- a/images/windows/templates/windows-2019.pkr.hcl
+++ b/images/windows/templates/windows-2019.pkr.hcl
@@ -285,7 +285,8 @@ build {
       "${path.root}/../scripts/build/Install-DockerCompose.ps1",
       "${path.root}/../scripts/build/Install-PowershellCore.ps1",
       "${path.root}/../scripts/build/Install-WebPlatformInstaller.ps1",
-      "${path.root}/../scripts/build/Install-Runner.ps1"
+      "${path.root}/../scripts/build/Install-Runner.ps1",
+      "${path.root}/../scripts/build/Install-TortoiseSvn.ps1"
     ]
   }
 
diff --git a/images/windows/templates/windows-2022.pkr.hcl b/images/windows/templates/windows-2022.pkr.hcl
index 2fb94ea72..c37a36243 100644
--- a/images/windows/templates/windows-2022.pkr.hcl
+++ b/images/windows/templates/windows-2022.pkr.hcl
@@ -275,7 +275,8 @@ build {
       "${path.root}/../scripts/build/Install-DockerCompose.ps1",
       "${path.root}/../scripts/build/Install-PowershellCore.ps1",
       "${path.root}/../scripts/build/Install-WebPlatformInstaller.ps1",
-      "${path.root}/../scripts/build/Install-Runner.ps1"
+      "${path.root}/../scripts/build/Install-Runner.ps1",
+      "${path.root}/../scripts/build/Install-TortoiseSvn.ps1"
     ]
   }
 
diff --git a/images/windows/toolsets/toolset-2019.json b/images/windows/toolsets/toolset-2019.json
index 03397ba56..ee8afa005 100644
--- a/images/windows/toolsets/toolset-2019.json
+++ b/images/windows/toolsets/toolset-2019.json
@@ -434,7 +434,6 @@
                 "args": [ "--version", "5.32.1.1" ]
             },
             { "name": "pulumi" },
-            { "name": "tortoisesvn" },
             { "name": "swig" },
             { "name": "vswhere" },
             {
diff --git a/images/windows/toolsets/toolset-2022.json b/images/windows/toolsets/toolset-2022.json
index cc2c2011f..7a8e87b2b 100644
--- a/images/windows/toolsets/toolset-2022.json
+++ b/images/windows/toolsets/toolset-2022.json
@@ -335,7 +335,6 @@
                 "args": [ "--version", "5.32.1.1" ]
             },
             { "name": "pulumi" },
-            { "name": "tortoisesvn" },
             { "name": "swig" },
             { "name": "vswhere" },
             {