From 64b553b5d0d0748ad3e0a478c26e8e97425dfb75 Mon Sep 17 00:00:00 2001
From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com>
Date: Sat, 30 Oct 2021 13:05:59 +0300
Subject: [PATCH] [macOS] Install stable Xcode clt for Monterey (#4382)

---
 images/macos/provision/core/xcode-clt.sh | 4 ----
 images/macos/toolsets/toolset-12.json    | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/images/macos/provision/core/xcode-clt.sh b/images/macos/provision/core/xcode-clt.sh
index bb6cffaac..aecba8e83 100644
--- a/images/macos/provision/core/xcode-clt.sh
+++ b/images/macos/provision/core/xcode-clt.sh
@@ -12,10 +12,6 @@ install_clt() {
     clt_placeholder="/tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress"
     sudo touch $clt_placeholder
     cltPattern="Command Line Tools"
-    # Command Line Tools for Xcode 13.0 does not support macOS 12
-    if is_Monterey; then
-        cltPattern="Command Line Tools beta"
-    fi
 
     clt_label_command="/usr/sbin/softwareupdate -l |
                         grep -B 1 -E '${cltPattern}' |
diff --git a/images/macos/toolsets/toolset-12.json b/images/macos/toolsets/toolset-12.json
index eb0d6f844..7548babc1 100644
--- a/images/macos/toolsets/toolset-12.json
+++ b/images/macos/toolsets/toolset-12.json
@@ -1,6 +1,6 @@
 {
     "xcode": {
-        "default": "13.0",
+        "default": "13.1",
         "versions": [
             { "link": "13.2", "version": "13.2.0" },
             { "link": "13.1", "version": "13.1.0" },