From 55a4c8c33c50c42f285f181a5a663291f52b2136 Mon Sep 17 00:00:00 2001
From: ilia-shipitsin <125650415+ilia-shipitsin@users.noreply.github.com>
Date: Fri, 4 Aug 2023 19:39:13 +0200
Subject: [PATCH] Macos 13 xcode 15 beta5 (#8037)

---
 images/macos/helpers/Xcode.Installer.psm1 | 5 ++++-
 images/macos/toolsets/toolset-13.json     | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1
index 89024f6d..e2398294 100644
--- a/images/macos/helpers/Xcode.Installer.psm1
+++ b/images/macos/helpers/Xcode.Installer.psm1
@@ -124,7 +124,10 @@ function Approve-XcodeLicense {
     $XcodeRootPath = Get-XcodeRootPath -Version $Version
     Write-Host "Approving Xcode license for '$XcodeRootPath'..."
     $xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild"
-    Invoke-ValidateCommand "sudo $xcodeBuildPath -license accept"
+    try {
+        Invoke-Expression -Command "sudo $xcodeBuildPath -license accept" 2>&1 | Out-Null
+    } catch { }
+
 }
 
 function Install-XcodeAdditionalPackages {
diff --git a/images/macos/toolsets/toolset-13.json b/images/macos/toolsets/toolset-13.json
index 40495d02..5067ee2d 100644
--- a/images/macos/toolsets/toolset-13.json
+++ b/images/macos/toolsets/toolset-13.json
@@ -3,7 +3,7 @@
         "default": "14.2",
         "x64": {
             "versions": [
-                { "link": "15.0", "version": "15.0.0-Beta.2+15A5161b" },
+                { "link": "15.0", "version": "15.0.0-Beta.5+15A5209g" },
                 { "link": "14.3.1", "version": "14.3.1+14E300c" },
                 { "link": "14.3", "version": "14.3.0+14E222b" },
                 { "link": "14.2", "version": "14.2.0+14C18" },
@@ -12,7 +12,7 @@
         },
         "arm64":{
             "versions": [
-                { "link": "15.0", "version": "15.0.0-Beta.2+15A5161b" },
+                { "link": "15.0", "version": "15.0.0-Beta.5+15A5209g" },
                 { "link": "14.3.1", "version": "14.3.1+14E300c" },
                 { "link": "14.3", "version": "14.3.0+14E222b" },
                 { "link": "14.2", "version": "14.2.0+14C18" },