From 38a1faf55dcfac744f1831cea1b1f4222b9cdb2a Mon Sep 17 00:00:00 2001
From: Mikhail Koliada <88318005+mikhailkoliada@users.noreply.github.com>
Date: Mon, 22 Aug 2022 19:03:47 +0200
Subject: [PATCH] [macOS] Remove xctool formula installation (#6128)

---
 images/macos/software-report/SoftwareReport.Xcode.psm1 | 7 -------
 images/macos/tests/BasicTools.Tests.ps1                | 6 ------
 images/macos/toolsets/toolset-10.15.json               | 1 -
 3 files changed, 14 deletions(-)

diff --git a/images/macos/software-report/SoftwareReport.Xcode.psm1 b/images/macos/software-report/SoftwareReport.Xcode.psm1
index b9ad8e834..e6038fbd2 100644
--- a/images/macos/software-report/SoftwareReport.Xcode.psm1
+++ b/images/macos/software-report/SoftwareReport.Xcode.psm1
@@ -246,13 +246,6 @@ function Build-XcodeSupportToolsSection {
         )
     }
 
-    if ($os.IsCatalina) {
-        $xctool = Run-Command "xctool --version"
-        $toolList += @(
-            "xctool $xctool"
-        )
-    }
-
     $output = ""
     $output += New-MDHeader "Xcode Support Tools" -Level 4
     $output += New-MDList -Style Unordered -Lines $toolList
diff --git a/images/macos/tests/BasicTools.Tests.ps1 b/images/macos/tests/BasicTools.Tests.ps1
index df7045b50..18b2003ad 100644
--- a/images/macos/tests/BasicTools.Tests.ps1
+++ b/images/macos/tests/BasicTools.Tests.ps1
@@ -150,12 +150,6 @@ Describe "virtualbox" -Skip:($os.IsBigSur) {
     }
 }
 
-Describe "xctool" -Skip:($os.IsHigherThanCatalina) {
-    It "xctool" {
-        "xctool --version" | Should -ReturnZeroExitCode
-    }
-}
-
 Describe "R" {
     It "R" {
         "R --version" | Should -ReturnZeroExitCode
diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json
index b3050f77c..da9f30401 100644
--- a/images/macos/toolsets/toolset-10.15.json
+++ b/images/macos/toolsets/toolset-10.15.json
@@ -221,7 +221,6 @@
             "subversion",
             "swiftformat",
             "swig",
-            "xctool",
             "zstd",
             "zlib",
             "libxext",