From 1aad4c7b8d87d7d998018698f16e2e973a8615fd Mon Sep 17 00:00:00 2001
From: Maxim Lobanov <v-malob@microsoft.com>
Date: Wed, 11 Nov 2020 14:33:35 +0300
Subject: [PATCH] accept proposal

---
 images/macos/helpers/Xcode.Helpers.psm1   | 1 -
 images/macos/helpers/Xcode.Installer.psm1 | 8 +++-----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/images/macos/helpers/Xcode.Helpers.psm1 b/images/macos/helpers/Xcode.Helpers.psm1
index 2b2ebeef..de3b94be 100644
--- a/images/macos/helpers/Xcode.Helpers.psm1
+++ b/images/macos/helpers/Xcode.Helpers.psm1
@@ -42,7 +42,6 @@ function Get-XcodeVersionInfo {
     }
 }
 
-
 function Switch-Xcode {
     param (
         [Parameter(ParameterSetName = 'Version')]
diff --git a/images/macos/helpers/Xcode.Installer.psm1 b/images/macos/helpers/Xcode.Installer.psm1
index 37b48c5b..7ccf9fb1 100644
--- a/images/macos/helpers/Xcode.Installer.psm1
+++ b/images/macos/helpers/Xcode.Installer.psm1
@@ -53,11 +53,9 @@ function Resolve-ExactXcodeVersion {
 function Get-AvailableXcodeVersions {
     $rawVersionsList = & xcversion list | ForEach-Object { $_.Trim() } | Where-Object { $_ -match "^\d" }
     $availableVersions = $rawVersionsList | ForEach-Object {
-        $parts = $_.Split(" ", 2)
-        $stableSemver = [SemVer]::Parse($parts[0])
-        if ($parts.Count -eq 1) {
-            $semver = $stableSemver
-        } else {
+        $partStable,$partMajor = $_.Split(" ", 2)
+        $semver = $stableSemver = [SemVer]::Parse($partStable)
+        if ($partMajor) {
             # Convert 'beta 3' -> 'beta.3', 'Release Candidate' -> 'releasecandidate', 'GM Seed 2' -> 'gmseed.2'
             $normalizedLabel = $parts[1].toLower() -replace " (\d)", '.$1' -replace " ([a-z])", '$1'
             $semver = [SemVer]::new($stableSemver.Major, $stableSemver.Minor, $stableSemver.Patch, $normalizedLabel)