From bf48ac16ea816035f7d7de8b5b77d19553f50093 Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <v-malob@microsoft.com>
Date: Fri, 6 Nov 2020 14:38:43 +0300
Subject: [PATCH] fix typos

---
 images/macos/helpers/Xcode.Installer.psm1 | 5 ++++-
 images/macos/tests/Xcode.Tests.ps1        | 2 +-
 images/macos/toolsets/toolset-10.14.json  | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1
index 80a50eb08..5f2169d75 100644
--- a/images/macos/helpers/Xcode.Installer.psm1
+++ b/images/macos/helpers/Xcode.Installer.psm1
@@ -109,6 +109,7 @@ function Confirm-XcodeIntegrity {
 
     $XcodeRootPath = Get-XcodeRootPath -Version $Version
     if (Test-XcodeStableRelease -XcodeRootPath $XcodeRootPath) {
+        Write-Host "Validating Xcode integrity for '$XcodeRootPath'..."
         Invoke-ExpressionWithValidation "spctl --assess --raw $XcodeRootPath"
     }
 }
@@ -119,7 +120,9 @@ function Approve-XcodeLicense {
         [string]$Version
     )
 
-    $xcodeBuildPath = Get-XcodeToolPath -Version $Version -ToolName "xcodebuild"
+    $XcodeRootPath = Get-XcodeRootPath -Version $Version
+    Write-Host "Approving Xcode license for '$XcodeRootPath'..."
+    $xcodeBuildPath = Get-XcodeToolPath -XcodeRootPath $XcodeRootPath -ToolName "xcodebuild"
     Invoke-ExpressionWithValidation "sudo $xcodeBuildPath -license accept"
 }
 
diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1
index 78c0ca078..244b66dc8 100644
--- a/images/macos/tests/Xcode.Tests.ps1
+++ b/images/macos/tests/Xcode.Tests.ps1
@@ -21,7 +21,7 @@ Describe "Xcode" {
         $defaultXcodeTestCase = @{ DefaultXcode = $defaultXcode }
         It "Default Xcode is <DefaultXcode>" -TestCases $defaultXcodeTestCase {
             "xcodebuild -version" | Should -ReturnZeroExitCode
-            (Get-CommandResult "xcodebuild -version").Output | Should -BeLike "Xcode ${DefaultXcode}.*"
+            (Get-CommandResult "xcodebuild -version").Output | Should -BeLike "Xcode ${DefaultXcode}*"
         }
 
         It "Xcode.app points to default Xcode" -TestCases $defaultXcodeTestCase {
diff --git a/images/macos/toolsets/toolset-10.14.json b/images/macos/toolsets/toolset-10.14.json
index 75041b5cd..68096c683 100644
--- a/images/macos/toolsets/toolset-10.14.json
+++ b/images/macos/toolsets/toolset-10.14.json
@@ -12,7 +12,6 @@
             { "link": "10.2.1", "version": "10.2.1", "symlinks": ["10.2.1_beta"] },
             { "link": "10.2", "version": "10.2.0", "symlinks": ["10.2_beta"] },
             { "link": "10.1", "version": "10.1.0", "symlinks": ["10.1_beta"] },
-            { "link": "10.1", "version": "10.1.0", "symlinks": ["10.1_beta"] },
             { "link": "10", "version": "10.0.0", "symlinks": ["10_beta"] },
             { "link": "9.4.1", "version": "9.4.1", "symlinks": ["9.4.1_beta"] }
         ]