From 5ab1cb345e583ded4d4300f8f43de7358942e39e Mon Sep 17 00:00:00 2001
From: Dibir Magomedsaygitov
<61747324+dibir-magomedsaygitov@users.noreply.github.com>
Date: Thu, 18 Nov 2021 17:23:05 +0300
Subject: [PATCH] [macOS] Remove macOS 10.13 related code in the VE repo
(#4494)
---
images.CI/macos/azure-pipelines/macos1013.yml | 16 -
images.CI/macos/move-vm.ps1 | 6 +-
images/macos/helpers/Common.Helpers.psm1 | 1 -
images/macos/macos-10.13-Readme.md | 340 ------------------
images/macos/provision/core/firefox.sh | 14 +-
images/macos/provision/core/ruby.sh | 5 -
.../provision/core/toolcache-high-sierra.sh | 25 --
images/macos/provision/utils/utils.sh | 18 +-
.../SoftwareReport.Generator.ps1 | 71 ++--
.../SoftwareReport.Toolcache.psm1 | 11 +-
images/macos/templates/macOS-10.13.json | 208 -----------
images/macos/tests/Common.Tests.ps1 | 6 +-
images/macos/tests/Haskell.Tests.ps1 | 2 +-
images/macos/tests/Linters.Tests.ps1 | 2 +-
images/macos/tests/Rust.Tests.ps1 | 2 +-
images/macos/tests/System.Tests.ps1 | 4 +-
images/macos/tests/Toolcache.Tests.ps1 | 4 +-
images/macos/tests/Xcode.Tests.ps1 | 2 +-
images/macos/toolsets/toolset-10.13.json | 296 ---------------
19 files changed, 54 insertions(+), 979 deletions(-)
delete mode 100644 images.CI/macos/azure-pipelines/macos1013.yml
delete mode 100644 images/macos/macos-10.13-Readme.md
delete mode 100644 images/macos/provision/core/toolcache-high-sierra.sh
delete mode 100644 images/macos/templates/macOS-10.13.json
delete mode 100644 images/macos/toolsets/toolset-10.13.json
diff --git a/images.CI/macos/azure-pipelines/macos1013.yml b/images.CI/macos/azure-pipelines/macos1013.yml
deleted file mode 100644
index 37db40b88..000000000
--- a/images.CI/macos/azure-pipelines/macos1013.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: macOS-10.13_$(date:yyyyMMdd)$(rev:.r)_unstable
-
-trigger: none
-pr:
- autoCancel: true
- branches:
- include:
- - main
-
-jobs:
-- template: image-generation.yml
- parameters:
- image_label: 'macOS High Sierra'
- base_image_name: 'clean-macOS-10.13.6-380Gb-SIPoff_runner'
- template_path: 'templates/macOS-10.13.json'
- target_datastore: 'ds-image'
diff --git a/images.CI/macos/move-vm.ps1 b/images.CI/macos/move-vm.ps1
index 7e8f999ce..8e8c3b749 100644
--- a/images.CI/macos/move-vm.ps1
+++ b/images.CI/macos/move-vm.ps1
@@ -82,10 +82,8 @@ try {
}
try {
- if ($VMName -notmatch "10.13") {
- Write-Host "Change CPU count to $CpuCount, cores count to $CoresPerSocketCount, amount of RAM to $Memory"
- $vm | Set-VM -NumCPU $CpuCount -CoresPerSocket $CoresPerSocketCount -MemoryMB $Memory -Confirm:$false -ErrorAction Stop | Out-Null
- }
+ Write-Host "Change CPU count to $CpuCount, cores count to $CoresPerSocketCount, amount of RAM to $Memory"
+ $vm | Set-VM -NumCPU $CpuCount -CoresPerSocket $CoresPerSocketCount -MemoryMB $Memory -Confirm:$false -ErrorAction Stop | Out-Null
} catch {
Write-Host "##vso[task.LogIssue type=error;]Failed to change specs for VM '$VMName'"
}
diff --git a/images/macos/helpers/Common.Helpers.psm1 b/images/macos/helpers/Common.Helpers.psm1
index 1d42cb0d8..a84871f1b 100644
--- a/images/macos/helpers/Common.Helpers.psm1
+++ b/images/macos/helpers/Common.Helpers.psm1
@@ -34,7 +34,6 @@ function Get-OSVersion {
return [PSCustomObject]@{
Version = $osVersion.Version
Platform = $osVersion.Platform
- IsHighSierra = $osVersionMajorMinor -eq "10.13"
IsMojave = $osVersionMajorMinor -eq "10.14"
IsCatalina = $osVersionMajorMinor -eq "10.15"
IsBigSur = $osVersionMajorMinor -eq "11.0"
diff --git a/images/macos/macos-10.13-Readme.md b/images/macos/macos-10.13-Readme.md
deleted file mode 100644
index e49d7cb31..000000000
--- a/images/macos/macos-10.13-Readme.md
+++ /dev/null
@@ -1,340 +0,0 @@
-| Announcements |
-|-|
-| [[macOS] Az modules will be upgraded from 4.8.0 to 5.7.0 on April, 12](https://github.com/actions/virtual-environments/issues/3129) |
-| [macOS 11.0 pools will be transited to private preview.](https://github.com/actions/virtual-environments/issues/2486) |
-***
-# macOS 10.13 info
-- System Version: macOS 10.13.6 (17G14033)
-- Kernel Version: Darwin 17.7.0
-- Image Version: 20210413.1
-
-## Installed Software
-### Language and Runtime
-- .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507
-- Bash 3.2.57(1)-release
-- Go 1.15.11
-- julia 1.6.0
-- Node.js v8.17.0
-- NVM - Cached node versions: v10.24.1 v12.22.1 v14.16.1
-- NVM 0.38.0
-- Perl 5.32.1
-- PHP 8.0.3
-- Python 2.7.18
-- Python 3.9.4
-- R 4.0.5
-- Ruby 2.7.3p183
-
-### Package Management
-- Bundler version 2.2.16
-- Carthage 0.37.0
-- CocoaPods 1.10.1
-- Composer 2.0.12
-- Homebrew 3.1.1
-- Miniconda 4.9.2
-- NPM 3.10.10
-- NuGet 4.7.0.5148
-- Pip 20.3.4 (python 2.7)
-- Pip 21.0.1 (python 3.9)
-- Pipx 0.16.1.0
-- RubyGems 3.2.16
-- Yarn 1.22.5
-
-#### Environment variables
-| Name | Value |
-| ----------------------- | -------------------- |
-| CONDA | /usr/local/miniconda |
-| VCPKG_INSTALLATION_ROOT | |
-
-### Project Management
-- Apache Ant(TM) 1.10.9
-- Apache Maven 3.8.1
-- Gradle 7.0
-
-### Utilities
-- 7-Zip 17.04
-- aria2 1.35.0
-- azcopy 10.9.0
-- bazel 3.7.1
-- bazelisk 1.7.5
-- bsdtar 2.8.3 - available by 'tar' alias
-- Curl 7.76.0
-- Git LFS: 2.13.3
-- Git: 2.31.1
-- GitHub CLI: 1.8.1
-- GNU parallel 20210322
-- GNU Tar 1.34 - available by 'gtar' alias
-- GNU Wget 1.21.1
-- gpg (GnuPG) 2.2.27
-- helm v3.5.3+g041ce5a
-- Hub CLI: 2.14.2
-- jq 1.6
-- mongo v4.4.4
-- mongod v4.4.4
-- OpenSSL 1.1.1k 25 Mar 2021 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.1/1.1.1k)`
-- Packer 1.7.2
-- PostgreSQL 13.2
-- psql (PostgreSQL) 13.2
-- Subversion (SVN) 1.14.1
-- Vagrant 2.2.15
-- virtualbox 6.1.18r142142
-- zstd 1.4.9
-
-
-### Tools
-- Aliyun CLI 3.0.73
-- App Center CLI 1.2.2
-- AWS CLI 2.1.37
-- AWS SAM CLI 1.22.0
-- AWS Session Manager CLI 1.2.30.0
-- Azure CLI 2.22.0
-- Cmake 3.20.1
-- Fastlane 2.180.1
-- Xcode Command Line Tools 10.1.0.0.1.1539992718
-
-### Linters
-- yamllint 1.26.1
-
-### Browsers
-- Safari 13.1.2 (13609.3.5.1.5)
-- SafariDriver 13.1.2 (13609.3.5.1.5)
-- Google Chrome 89.0.4389.128
-- ChromeDriver 89.0.4389.23
-- Microsoft Edge 89.0.774.75
-- MSEdgeDriver 89.0.774.76
-- Mozilla Firefox 87.0
-- geckodriver 0.29.1 (970ef713fe58 2021-04-08 23:34 +0200)
-
-#### Environment variables
-| Name | Value |
-| --------------- | --------------------------------------------- |
-| CHROMEWEBDRIVER | /usr/local/Caskroom/chromedriver/89.0.4389.23 |
-| EDGEWEBDRIVER | /usr/local/share/edge_driver |
-| GECKOWEBDRIVER | /usr/local/bin |
-
-### Java
-| Version | Vendor | Environment Variable |
-| ----------- | ------------- | -------------------- |
-| 8.0.282+8 | Adopt OpenJDK | JAVA_HOME_8_X64 |
-| 11.0.10+9 | Adopt OpenJDK | JAVA_HOME_11_X64 |
-| 12.0.2+10.3 | Adopt OpenJDK | JAVA_HOME_12_X64 |
-| 13.0.2+8.1 | Adopt OpenJDK | JAVA_HOME_13_X64 |
-| 14.0.2+12 | Adopt OpenJDK | JAVA_HOME_14_X64 |
-
-### Cached Tools
-#### Ruby
-- 2.4.10
-- 2.5.8
-- 2.6.6
-- 2.7.1
-
-#### Python
-- 2.7.17
-- 3.5.10
-- 3.6.10
-- 3.7.6
-- 3.8.2
-
-#### PyPy
-- 2.7.18 [PyPy 7.3.4]
-- 3.6.12 [PyPy 7.3.3]
-
-### PowerShell Tools
-- PowerShell 7.1.3
-
-#### PowerShell Modules
-| Module | Version |
-| ---------------- | ------- |
-| Az | 4.8.0 |
-| MarkdownPS | 1.9 |
-| Pester | 5.1.1 |
-| PSScriptAnalyzer | 1.19.1 |
-
-### Xamarin
-#### Visual Studio for Mac
-- 8.3.11.1
-
-#### Xamarin bundles
-| symlink | Xamarin.Mono | Xamarin.iOS | Xamarin.Mac | Xamarin.Android |
-| ---------------- | ------------ | ----------- | ----------- | --------------- |
-| 6_4_2 | 6.4 | 13.6 | 6.6 | 10.0 |
-| 6_4_1 | 6.4 | 13.4 | 6.4 | 10.0 |
-| 6_4_0 | 6.4 | 13.2 | 6.2 | 10.0 |
-| 6_0_0 | 6.0 | 12.14 | 5.16 | 9.4 |
-| 5_18_3 | 5.18 | 12.10 | 5.10 | 9.3 |
-| 5_18_2 | 5.18 | 12.8 | 5.8 | 9.2 |
-| 5_18_1 | 5.18 | 12.6 | 5.6 | 9.2 |
-| 5_16_0_0 | 5.16 | 12.2 | 5.2 | 9.1 |
-| 5_16_0 | 5.16 | 12.2 | 5.2 | 9.1 |
-| 5_12_0_3 | 5.12 | 12.2 | 5.3 | 9.0 |
-| 5_12_0_XC10_PRE | 5.12 | 12.0 | 5.2 | 9.0 |
-| 5_12_0 (default) | 5.12 | 11.14 | 4.6 | 9.0 |
-| 5_10_1 | 5.10 | 11.12 | 4.4 | 8.3 |
-| 5_8_1 | 5.8 | 11.9 | 4.2 | 8.2 |
-| 5_8_0 | 5.8 | 11.8 | 4.2 | 8.2 |
-| 5_4_1 | 5.4 | 11.6 | 4.0 | 8.1 |
-| 5_4_0 | 5.4 | 11.2 | 3.8 | 8.0 |
-| 5_2_0 | 5.2 | 11.0 | 3.6 | 7.4 |
-| Legacy_5_0_1 | 5.0 | 10.10 | 3.4 | 7.3 |
-| Legacy_4_8_1 | 4.8 | 10.6 | 3.0 | 7.1 |
-
-#### Unit Test Framework
-- NUnit 3.6.1
-
-### Xcode
-| Version | Build | Path |
-| -------------- | ------- | ----------------------------- |
-| 10.1 (default) | 10B61 | /Applications/Xcode_10.1.app |
-| 10.0 | 10A255 | /Applications/Xcode_10.app |
-| 9.4.1 | 9F2000 | /Applications/Xcode_9.4.1.app |
-| 9.4 | 9F1027a | /Applications/Xcode_9.4.app |
-| 9.3.1 | 9E501 | /Applications/Xcode_9.3.1.app |
-| 9.3 | 9E145 | /Applications/Xcode_9.3.app |
-| 9.2 | 9C40b | /Applications/Xcode_9.2.app |
-| 9.1 | 9B55 | /Applications/Xcode_9.1.app |
-| 9.0 | 9A235 | /Applications/Xcode_9.app |
-| 8.3.3 | 8E3004b | /Applications/Xcode_8.3.3.app |
-| 8.2.1 | 8C1002 | /Applications/Xcode_8.2.1.app |
-| 8.1 | 8B62 | /Applications/Xcode_8.1.app |
-| 8.0 | 8A218a | /Applications/Xcode_8.app |
-
-#### Xcode Support Tools
-- xcpretty 0.3.0
-- xcversion 2.6.8
-- Nomad CLI 3.2.16
-- Nomad CLI IPA ipa 0.14.3
-- xctool 0.3.7
-
-#### Installed SDKs
-| SDK | SDK Name | Xcode Version |
-| ----------------------- | -------------------- | ------------------------------------- |
-| macOS 10.12 | macosx10.12 | 8.0, 8.1, 8.2.1, 8.3.3 |
-| macOS 10.13 | macosx10.13 | 9.0, 9.1, 9.2, 9.3, 9.3.1, 9.4, 9.4.1 |
-| macOS 10.14 | macosx10.14 | 10.0, 10.1 |
-| iOS 10.0 | iphoneos10.0 | 8.0 |
-| iOS 10.1 | iphoneos10.1 | 8.1 |
-| iOS 10.2 | iphoneos10.2 | 8.2.1 |
-| iOS 10.3 | iphoneos10.3 | 8.3.3 |
-| iOS 11.0 | iphoneos11.0 | 9.0 |
-| iOS 11.1 | iphoneos11.1 | 9.1 |
-| iOS 11.2 | iphoneos11.2 | 9.2 |
-| iOS 11.3 | iphoneos11.3 | 9.3, 9.3.1 |
-| iOS 11.4 | iphoneos11.4 | 9.4, 9.4.1 |
-| iOS 12.0 | iphoneos12.0 | 10.0 |
-| iOS 12.1 | iphoneos12.1 | 10.1 |
-| Simulator - iOS 10.0 | iphonesimulator10.0 | 8.0 |
-| Simulator - iOS 10.1 | iphonesimulator10.1 | 8.1 |
-| Simulator - iOS 10.2 | iphonesimulator10.2 | 8.2.1 |
-| Simulator - iOS 10.3 | iphonesimulator10.3 | 8.3.3 |
-| Simulator - iOS 11.0 | iphonesimulator11.0 | 9.0 |
-| Simulator - iOS 11.1 | iphonesimulator11.1 | 9.1 |
-| Simulator - iOS 11.2 | iphonesimulator11.2 | 9.2 |
-| Simulator - iOS 11.3 | iphonesimulator11.3 | 9.3, 9.3.1 |
-| Simulator - iOS 11.4 | iphonesimulator11.4 | 9.4, 9.4.1 |
-| Simulator - iOS 12.0 | iphonesimulator12.0 | 10.0 |
-| Simulator - iOS 12.1 | iphonesimulator12.1 | 10.1 |
-| tvOS 10.0 | appletvos10.0 | 8.0, 8.1 |
-| tvOS 10.1 | appletvos10.1 | 8.2.1 |
-| tvOS 10.2 | appletvos10.2 | 8.3.3 |
-| tvOS 11.0 | appletvos11.0 | 9.0 |
-| tvOS 11.1 | appletvos11.1 | 9.1 |
-| tvOS 11.2 | appletvos11.2 | 9.2 |
-| tvOS 11.3 | appletvos11.3 | 9.3, 9.3.1 |
-| tvOS 11.4 | appletvos11.4 | 9.4, 9.4.1 |
-| tvOS 12.0 | appletvos12.0 | 10.0 |
-| tvOS 12.1 | appletvos12.1 | 10.1 |
-| Simulator - tvOS 10.0 | appletvsimulator10.0 | 8.0, 8.1 |
-| Simulator - tvOS 10.1 | appletvsimulator10.1 | 8.2.1 |
-| Simulator - tvOS 10.2 | appletvsimulator10.2 | 8.3.3 |
-| Simulator - tvOS 11.0 | appletvsimulator11.0 | 9.0 |
-| Simulator - tvOS 11.1 | appletvsimulator11.1 | 9.1 |
-| Simulator - tvOS 11.2 | appletvsimulator11.2 | 9.2 |
-| Simulator - tvOS 11.3 | appletvsimulator11.3 | 9.3, 9.3.1 |
-| Simulator - tvOS 11.4 | appletvsimulator11.4 | 9.4, 9.4.1 |
-| Simulator - tvOS 12.0 | appletvsimulator12.0 | 10.0 |
-| Simulator - tvOS 12.1 | appletvsimulator12.1 | 10.1 |
-| watchOS 3.0 | watchos3.0 | 8.0 |
-| watchOS 3.1 | watchos3.1 | 8.1, 8.2.1 |
-| watchOS 3.2 | watchos3.2 | 8.3.3 |
-| watchOS 4.0 | watchos4.0 | 9.0 |
-| watchOS 4.1 | watchos4.1 | 9.1 |
-| watchOS 4.2 | watchos4.2 | 9.2 |
-| watchOS 4.3 | watchos4.3 | 9.3, 9.3.1, 9.4, 9.4.1 |
-| watchOS 5.0 | watchos5.0 | 10.0 |
-| watchOS 5.1 | watchos5.1 | 10.1 |
-| Simulator - watchOS 3.0 | watchsimulator3.0 | 8.0 |
-| Simulator - watchOS 3.1 | watchsimulator3.1 | 8.1, 8.2.1 |
-| Simulator - watchOS 3.2 | watchsimulator3.2 | 8.3.3 |
-| Simulator - watchOS 4.0 | watchsimulator4.0 | 9.0 |
-| Simulator - watchOS 4.1 | watchsimulator4.1 | 9.1 |
-| Simulator - watchOS 4.2 | watchsimulator4.2 | 9.2 |
-| Simulator - watchOS 4.3 | watchsimulator4.3 | 9.3, 9.3.1, 9.4, 9.4.1 |
-| Simulator - watchOS 5.0 | watchsimulator5.0 | 10.0 |
-| Simulator - watchOS 5.1 | watchsimulator5.1 | 10.1 |
-
-#### Installed Simulators
-| OS | Xcode Version | Simulators |
-| ----------- | ------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| iOS 8.4 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.1 | iPhone 4s
iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPad 2
iPad Air
iPad Retina |
-| iOS 9.0 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.1 | iPhone 4s
iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPad 2
iPad Air
iPad Air 2
iPad Retina |
-| iOS 9.1 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.1 | iPhone 4s
iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPad 2
iPad Air
iPad Air 2
iPad Pro
iPad Retina |
-| iOS 9.2 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.1 | iPhone 4s
iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPad 2
iPad Air
iPad Air 2
iPad Pro
iPad Retina |
-| iOS 9.3 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.1 | iPhone 4s
iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPad 2
iPad Air
iPad Air 2
iPad Pro
iPad Retina |
-| iOS 10.0 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.1 | iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone SE
iPad Air
iPad Air 2
iPad Pro (12.9 inch)
iPad Pro (9.7 inch)
iPad Retina |
-| iOS 10.1 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.1 | iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone SE
iPad Air
iPad Air 2
iPad Pro (12.9 inch)
iPad Pro (9.7 inch)
iPad Retina |
-| iOS 10.2 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.1 | iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone SE
iPad Air
iPad Air 2
iPad Pro (12.9 inch)
iPad Pro (9.7 inch)
iPad Retina |
-| iOS 10.3 | 8.0
8.1
8.2.1
8.3.3
9.0
9.1
9.2
9.3
9.3.1
9.4
9.4.1
10.0
10.1 | iPhone 5
iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone SE
iPad (5th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (12.9 inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (9.7 inch)
iPad Retina |
-| iOS 11.0 | 9.0 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPad (5th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (9.7-inch) |
-| iOS 11.1 | 9.1 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPad (5th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (9.7-inch) |
-| iOS 11.2 | 9.2 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPad (5th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (9.7-inch) |
-| iOS 11.3 | 9.3
9.3.1 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPad (5th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (9.7-inch) |
-| iOS 11.4 | 9.4
9.4.1 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPad (5th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (9.7-inch) |
-| iOS 12.0 | 10.0 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPhone XR
iPhone XS
iPhone XS Max
iPad (5th generation)
iPad (6th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (9.7-inch) |
-| iOS 12.1 | 10.1 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPhone XR
iPhone XS
iPhone XS Max
iPad (5th generation)
iPad (6th generation)
iPad Air
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) |
-| tvOS 10.0 | 8.0
8.1 | Apple TV 1080p |
-| tvOS 10.1 | 8.2.1 | Apple TV 1080p |
-| tvOS 10.2 | 8.3.3 | Apple TV 1080p |
-| tvOS 11.0 | 9.0 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 11.1 | 9.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 11.2 | 9.2 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 11.3 | 9.3
9.3.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 11.4 | 9.4
9.4.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 12.0 | 10.0 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| tvOS 12.1 | 10.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) |
-| watchOS 3.0 | 8.0 | Apple Watch - 38mm
Apple Watch - 42mm
Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm |
-| watchOS 3.1 | 8.1
8.2.1 | Apple Watch - 38mm
Apple Watch - 42mm
Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm |
-| watchOS 3.2 | 8.3.3 | Apple Watch - 38mm
Apple Watch - 42mm
Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm |
-| watchOS 4.0 | 9.0 | Apple Watch - 38mm
Apple Watch - 42mm
Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm |
-| watchOS 4.1 | 9.1 | Apple Watch - 38mm
Apple Watch - 42mm
Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm |
-| watchOS 4.2 | 9.2 | Apple Watch - 38mm
Apple Watch - 42mm
Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm |
-| watchOS 4.3 | 9.3
9.3.1
9.4
9.4.1 | Apple Watch - 38mm
Apple Watch - 42mm
Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm |
-| watchOS 5.0 | 10.0 | Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm
Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm |
-| watchOS 5.1 | 10.1 | Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm
Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm |
-
-### Android
-| Package Name | Version |
-| -------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Android Emulator | 30.5.4 |
-| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2 30.0.3
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3 23.0.0
22.0.1 22.0.0
21.1.2 21.0.0 21.0.1 21.0.2 21.1.0 21.1.1
20.0.0
19.1.0 19.0.0 19.0.1 19.0.2 19.0.3
18.0.1 18.1.0 18.1.1
17.0.0 |
-| Android SDK Platforms | android-S (rev 2)
android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4)
android-18 (rev 3)
android-17 (rev 3)
android-16 (rev 5)
android-15 (rev 5) |
-| Android SDK Platform-Tools | 31.0.1 |
-| Android SDK Tools | 26.1.1 |
-| Android Support Repository | 47.0.0 |
-| CMake | 3.10.2 |
-| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 |
-| Google Play services | 49 |
-| Google Repository | 58 |
-| NDK | 15.2.4203891
18.1.5063045
21.4.7075529
22.1.7171670 |
-| SDK Patch Applier v4 | 1 |
-
-#### Environment variables
-| Name | Value |
-| ----------------------- | -------------------------------------------------------------------------------------------------- |
-| ANDROID_HOME | /Users/runner/Library/Android/sdk |
-| ANDROID_NDK_18R_PATH | /Users/runner/Library/Android/sdk/ndk/18.1.5063045 |
-| ANDROID_NDK_HOME | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 |
-| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/22.1.7171670 |
-| ANDROID_NDK_ROOT | /Users/runner/Library/Android/sdk/ndk-bundle -> /Users/runner/Library/Android/sdk/ndk/21.4.7075529 |
-| ANDROID_SDK_ROOT | /Users/runner/Library/Android/sdk |
-
-
-
diff --git a/images/macos/provision/core/firefox.sh b/images/macos/provision/core/firefox.sh
index 1173de925..f2527c349 100644
--- a/images/macos/provision/core/firefox.sh
+++ b/images/macos/provision/core/firefox.sh
@@ -4,17 +4,9 @@ source ~/utils/utils.sh
echo "Installing Firefox..."
brew install --cask firefox
-# High Sierra builds driver from sources, and it takes about 2 hours. It's much faster to download the binary directly
-if ! is_HighSierra; then
- echo "Installing Geckodriver..."
- brew_smart_install "geckodriver"
- geckoPath="$(brew --prefix geckodriver)/bin"
-else
- geckoUrl="$(curl -s https://api.github.com/repos/mozilla/geckodriver/releases/latest | jq -r '.assets[].browser_download_url | select(endswith("macos.tar.gz"))')"
- download_with_retries $geckoUrl "/tmp" "geckodriver.tar.gz"
- geckoPath="/usr/local/bin"
- tar -xzf /tmp/geckodriver.tar.gz -C $geckoPath
-fi
+echo "Installing Geckodriver..."
+brew_smart_install "geckodriver"
+geckoPath="$(brew --prefix geckodriver)/bin"
echo "Add GECKOWEBDRIVER to bashrc..."
echo "export GECKOWEBDRIVER=${geckoPath}" >> "${HOME}/.bashrc"
diff --git a/images/macos/provision/core/ruby.sh b/images/macos/provision/core/ruby.sh
index 53b21938d..e4c198a6a 100755
--- a/images/macos/provision/core/ruby.sh
+++ b/images/macos/provision/core/ruby.sh
@@ -9,11 +9,6 @@ GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'`
echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc"
echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"' >> "$HOME/.bashrc"
-#if High Sierra - skip installation from toolset
-if is_HighSierra; then
- exit 0
-fi
-
echo "Install Ruby from toolset..."
PACKAGE_TAR_NAMES=$(curl -s "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name')
TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .versions[]')
diff --git a/images/macos/provision/core/toolcache-high-sierra.sh b/images/macos/provision/core/toolcache-high-sierra.sh
deleted file mode 100644
index a834d87a4..000000000
--- a/images/macos/provision/core/toolcache-high-sierra.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash -e -o pipefail
-###########################################################################
-# The script downloads macos hosted tool cache for several Python versions
-# and installs them onto the system
-#
-###########################################################################
-SOURCE_URL="https://vstsagenttools.blob.core.windows.net/tools"
-PACKAGES_DIR=/tmp/hostedtoolcache
-
-# Download hosted tool cache with azcopy
-azcopy copy $SOURCE_URL $PACKAGES_DIR --include-path "hostedtoolcache/macos-10.13" --recursive
-mv $PACKAGES_DIR/tools/hostedtoolcache/macos-10.13/* $PACKAGES_DIR
-
-if [ $? -ne 0 ]; then
- echo "An error occured while downloading hostedtoolcache"
- exit 1
-fi
-
-# Install the tools from the hosted tool cache
-packages=$(find $PACKAGES_DIR -name package.json)
-for package in $packages; do
- pushd $(dirname $package)
- npm install
- popd
-done;
\ No newline at end of file
diff --git a/images/macos/provision/utils/utils.sh b/images/macos/provision/utils/utils.sh
index 090fa60e3..a51fab435 100755
--- a/images/macos/provision/utils/utils.sh
+++ b/images/macos/provision/utils/utils.sh
@@ -71,16 +71,8 @@ is_Mojave() {
fi
}
-is_HighSierra() {
- if [ "$OSTYPE" = "darwin17" ]; then
- true
- else
- false
- fi
-}
-
is_Less_Catalina() {
- if is_HighSierra || is_Mojave; then
+ if is_Mojave; then
true
else
false
@@ -88,7 +80,7 @@ is_Less_Catalina() {
}
is_Less_BigSur() {
- if is_HighSierra || is_Mojave || is_Catalina; then
+ if is_Mojave || is_Catalina; then
true
else
false
@@ -96,7 +88,7 @@ is_Less_BigSur() {
}
is_Less_Monterey() {
- if is_HighSierra || is_Mojave || is_Catalina || is_BigSur; then
+ if is_Mojave || is_Catalina || is_BigSur; then
true
else
false
@@ -132,9 +124,7 @@ brew_cask_install_ignoring_sha256() {
}
get_brew_os_keyword() {
- if is_HighSierra; then
- echo "high_sierra"
- elif is_Mojave; then
+ if is_Mojave; then
echo "mojave"
elif is_Catalina; then
echo "catalina"
diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1
index 706404eeb..3b892f309 100644
--- a/images/macos/software-report/SoftwareReport.Generator.ps1
+++ b/images/macos/software-report/SoftwareReport.Generator.ps1
@@ -52,7 +52,7 @@ if ($os.IsLessThanMonterey) {
)
}
-if ( -not $os.IsHighSierra -and $os.IsLessThanMonterey) {
+if ($os.IsLessThanMonterey) {
$languageAndRuntimeList += @(
(Get-GccVersion)
(Get-FortranVersion)
@@ -163,7 +163,7 @@ if ($os.IsLessThanBigSur) {
)
}
-if (-not $os.IsHighSierra -and $os.IsLessThanMonterey) {
+if ($os.IsLessThanMonterey) {
$utilitiesList += @(
(Get-SwitchAudioOsxVersion),
(Get-SoxVersion)
@@ -195,21 +195,17 @@ if ($os.IsLessThanMonterey) {
$toolsList += @(
(Get-XcodeCommandLineToolsVersion),
(Get-SwigVersion),
- (Get-BicepVersion)
+ (Get-BicepVersion),
+ (Get-GHCupVersion),
+ (Get-GHCVersion),
+ (Get-CabalVersion),
+ (Get-StackVersion)
)
-if( -not $os.IsHighSierra) {
+if($os.IsLessThanMonterey) {
$toolsList += @(
- (Get-GHCupVersion),
- (Get-GHCVersion),
- (Get-CabalVersion),
- (Get-StackVersion)
+ (Get-SwiftFormatVersion)
)
- if($os.IsLessThanMonterey) {
- $toolsList += @(
- (Get-SwiftFormatVersion)
- )
- }
}
$markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object)
@@ -217,15 +213,10 @@ $markdown += New-MDList -Style Unordered -Lines ($toolsList | Sort-Object)
# Linters
$markdown += New-MDHeader "Linters" -Level 3
$lintersList = @(
- (Get-YamllintVersion)
+ (Get-YamllintVersion),
+ (Get-SwiftLintVersion)
)
-if ( -not $os.IsHighSierra) {
- $lintersList += @(
- (Get-SwiftLintVersion)
- )
-}
-
$markdown += New-MDList -Style Unordered -Lines ($lintersList | Sort-Object)
$markdown += New-MDHeader "Browsers" -Level 3
@@ -241,27 +232,25 @@ $markdown += New-MDNewLine
# Toolcache
$markdown += Build-ToolcacheSection
-if ( -not $os.IsHighSierra) {
- $markdown += New-MDHeader "Rust Tools" -Level 3
- $markdown += New-MDList -Style Unordered -Lines (@(
- (Get-RustVersion),
- (Get-RustupVersion),
- (Get-RustdocVersion),
- (Get-RustCargoVersion)
- ) | Sort-Object
- )
-
- $markdown += New-MDHeader "Packages" -Level 4
- $markdown += New-MDList -Style Unordered -Lines (@(
- (Get-Bindgen),
- (Get-Cbindgen),
- (Get-Cargooutdated),
- (Get-Cargoaudit),
- (Get-RustfmtVersion),
- (Get-RustClippyVersion)
- ) | Sort-Object
- )
-}
+$markdown += New-MDHeader "Rust Tools" -Level 3
+$markdown += New-MDList -Style Unordered -Lines (@(
+ (Get-RustVersion),
+ (Get-RustupVersion),
+ (Get-RustdocVersion),
+ (Get-RustCargoVersion)
+ ) | Sort-Object
+)
+
+$markdown += New-MDHeader "Packages" -Level 4
+$markdown += New-MDList -Style Unordered -Lines (@(
+ (Get-Bindgen),
+ (Get-Cbindgen),
+ (Get-Cargooutdated),
+ (Get-Cargoaudit),
+ (Get-RustfmtVersion),
+ (Get-RustClippyVersion)
+ ) | Sort-Object
+)
$markdown += New-MDHeader "PowerShell Tools" -Level 3
$markdown += New-MDList -Lines (Get-PowershellVersion) -Style Unordered
diff --git a/images/macos/software-report/SoftwareReport.Toolcache.psm1 b/images/macos/software-report/SoftwareReport.Toolcache.psm1
index a31746cf7..3b39b6fc7 100644
--- a/images/macos/software-report/SoftwareReport.Toolcache.psm1
+++ b/images/macos/software-report/SoftwareReport.Toolcache.psm1
@@ -53,13 +53,10 @@ function Build-ToolcacheSection {
$output += New-MDList -Lines (Get-ToolcachePythonVersions) -Style Unordered
$output += New-MDHeader "PyPy" -Level 4
$output += New-MDList -Lines (Get-ToolcachePyPyVersions) -Style Unordered
-
- if( -not $os.IsHighSierra) {
- $output += New-MDHeader "Node.js" -Level 4
- $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered
- $output += New-MDHeader "Go" -Level 4
- $output += Get-ToolcacheGoTable
- }
+ $output += New-MDHeader "Node.js" -Level 4
+ $output += New-MDList -Lines (Get-ToolcacheNodeVersions) -Style Unordered
+ $output += New-MDHeader "Go" -Level 4
+ $output += Get-ToolcacheGoTable
return $output
}
diff --git a/images/macos/templates/macOS-10.13.json b/images/macos/templates/macOS-10.13.json
deleted file mode 100644
index 56f3b3e68..000000000
--- a/images/macos/templates/macOS-10.13.json
+++ /dev/null
@@ -1,208 +0,0 @@
-{
- "variables": {
- "vcenter_server": null,
- "vcenter_username": null,
- "vcenter_password": null,
- "vcenter_datacenter": null,
- "cluster_or_esxi_host": null,
- "esxi_datastore": null,
- "build_id": null,
- "baseimage_name": null,
- "output_folder": null,
- "vm_username": null,
- "vm_password": null,
- "xcode_install_user": null,
- "xcode_install_password": null,
- "image_os": "macos1013"
- },
- "builders": [
- {
- "type": "vsphere-clone",
- "vcenter_server": "{{user `vcenter_server`}}",
- "username": "{{user `vcenter_username`}}",
- "password": "{{user `vcenter_password`}}",
- "insecure_connection": true,
- "datacenter": "{{ user `vcenter_datacenter` }}",
- "template": "{{ user `baseimage_name` }}",
- "folder": "{{user `output_folder` }}",
- "host": "{{user `cluster_or_esxi_host`}}",
- "datastore": "{{user `esxi_datastore`}}",
- "vm_name": "{{user `build_id`}}",
- "ssh_username": "{{user `vm_username`}}",
- "ssh_password": "{{user `vm_password`}}",
- "CPUs": "10",
- "RAM": "24576",
- "NestedHV": "true",
- "shutdown_timeout": "15m"
- }
- ],
- "provisioners": [
- {
- "type": "shell",
- "inline": "mkdir ~/image-generation"
- },
- {
- "type": "file",
- "source": "./provision/assets",
- "destination": "~/image-generation/"
- },
- {
- "type": "file",
- "source": "./tests",
- "destination": "~/image-generation/"
- },
- {
- "type": "file",
- "source": "./software-report",
- "destination": "~/image-generation/"
- },
- {
- "type": "file",
- "source": "./helpers",
- "destination": "~/image-generation/"
- },
- {
- "type": "file",
- "source": "./provision/configuration/environment/bashrc",
- "destination": "~/.bashrc"
- },
- {
- "type": "file",
- "source": "./provision/configuration/environment/bashprofile",
- "destination": "~/.bash_profile"
- },
- {
- "type": "file",
- "source": "./provision/utils",
- "destination": "~/"
- },
- {
- "type": "file",
- "source": "./provision/bootstrap-provisioner",
- "destination": "~/bootstrap"
- },
- {
- "type": "file",
- "source": "./toolsets/toolset-10.13.json",
- "destination": "~/image-generation/toolset.json"
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
- "scripts": [
- "./provision/configuration/add-network-interface-detection.sh",
- "./provision/configuration/autologin.sh",
- "./provision/configuration/disable-auto-updates.sh",
- "./provision/configuration/screensaver-off.sh",
- "./provision/configuration/ntpconf.sh",
- "./provision/configuration/max-files.sh"
- ],
- "environment_vars": [
- "PASSWORD={{user `vm_password`}}",
- "USERNAME={{user `vm_username`}}"
- ]
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
- "scripts": [
- "./provision/configuration/preimagedata.sh",
- "./provision/configuration/configure-ssh.sh",
- "./provision/configuration/configure-machine.sh"
- ],
- "environment_vars": [
- "IMAGE_VERSION={{user `build_id`}}",
- "IMAGE_OS={{user `image_os`}}"
- ]
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
- "script": "./provision/core/reboot.sh",
- "expect_disconnect": true
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
- "pause_before": "30s",
- "scripts": [
- "./provision/core/xcode-clt.sh",
- "./provision/core/homebrew.sh",
- "./provision/core/powershell.sh",
- "./provision/core/dotnet.sh",
- "./provision/core/python.sh",
- "./provision/core/azcopy.sh",
- "./provision/core/openssl.sh",
- "./provision/core/ruby.sh",
- "./provision/core/rubygem.sh",
- "./provision/core/git.sh",
- "./provision/core/node.sh"
- ]
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} pwsh -f {{ .Path }}",
- "script": "./provision/core/xcode.ps1",
- "environment_vars": [
- "XCODE_INSTALL_USER={{user `xcode_install_user`}}",
- "XCODE_INSTALL_PASSWORD={{user `xcode_install_password`}}"
- ]
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; sudo {{ .Vars }} {{ .Path }}",
- "script": "./provision/core/reboot.sh",
- "expect_disconnect": true
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
- "scripts": [
- "./provision/core/commonutils.sh",
- "./provision/core/golang.sh",
- "./provision/core/openjdk.sh",
- "./provision/core/php.sh",
- "./provision/core/aws.sh",
- "./provision/core/cocoapods.sh",
- "./provision/core/android-toolsets.sh",
- "./provision/core/xamarin.sh",
- "./provision/core/xamarin-android-ndk.sh",
- "./provision/core/vsmac.sh",
- "./provision/core/nvm.sh",
- "./provision/core/postgresql.sh",
- "./provision/core/mongodb.sh",
- "./provision/core/miniconda.sh",
- "./provision/core/safari.sh",
- "./provision/core/chrome.sh",
- "./provision/core/edge.sh",
- "./provision/core/firefox.sh",
- "./provision/core/toolcache-high-sierra.sh",
- "./provision/core/pypy.sh",
- "./provision/core/pipx-packages.sh",
- "./provision/core/xcode-sims.sh",
- "./provision/core/build-xcode-symlinks.sh"
- ]
- },
- {
- "type": "shell",
- "inline": [
- "pwsh -File \"$HOME/image-generation/software-report/SoftwareReport.Generator.ps1\" -OutputDirectory \"$HOME/image-generation/output/software-report\" -ImageName {{user `build_id`}}",
- "pwsh -File \"$HOME/image-generation/tests/RunAll-Tests.ps1\""
- ]
- },
- {
- "type": "file",
- "direction": "download",
- "source": "~/image-generation/output/*",
- "destination": "../image-output/"
- },
- {
- "type": "shell",
- "execute_command": "chmod +x {{ .Path }}; {{ .Vars }} {{ .Path }}",
- "scripts": [
- "./provision/configuration/configure-hostname.sh",
- "./provision/configuration/finalize-vm.sh"
- ]
- }
- ]
-}
diff --git a/images/macos/tests/Common.Tests.ps1 b/images/macos/tests/Common.Tests.ps1
index 5b3c4730b..16d7878c5 100644
--- a/images/macos/tests/Common.Tests.ps1
+++ b/images/macos/tests/Common.Tests.ps1
@@ -9,7 +9,7 @@ Describe ".NET" {
}
}
-Describe "GCC" -Skip:($os.IsHighSierra -or $os.IsMonterey) {
+Describe "GCC" -Skip:($os.IsMonterey) {
$testCases = Get-ToolsetValue -KeyPath gcc.versions | ForEach-Object { @{Version = $_} }
It "GCC " -TestCases $testCases {
@@ -33,7 +33,7 @@ Describe "GCC" -Skip:($os.IsHighSierra -or $os.IsMonterey) {
}
}
-Describe "vcpkg" -Skip:($os.IsHighSierra -or $os.IsMojave -or $os.IsMonterey) {
+Describe "vcpkg" -Skip:($os.IsMojave -or $os.IsMonterey) {
It "vcpkg" {
"vcpkg version" | Should -ReturnZeroExitCode
}
@@ -66,7 +66,7 @@ Describe "Miniconda" -Skip:($os.IsMonterey) {
}
}
-Describe "Stack" -Skip:($os.IsHighSierra) {
+Describe "Stack" {
It "Stack" {
"stack --version" | Should -ReturnZeroExitCode
}
diff --git a/images/macos/tests/Haskell.Tests.ps1 b/images/macos/tests/Haskell.Tests.ps1
index 4bbf8884d..525e89342 100644
--- a/images/macos/tests/Haskell.Tests.ps1
+++ b/images/macos/tests/Haskell.Tests.ps1
@@ -1,6 +1,6 @@
$os = Get-OSVersion
-Describe "Haskell" -Skip:($os.IsHighSierra) {
+Describe "Haskell" {
Context "GHCup" {
It "GHCup" {
"ghcup --version" | Should -ReturnZeroExitCode
diff --git a/images/macos/tests/Linters.Tests.ps1 b/images/macos/tests/Linters.Tests.ps1
index 6517b56df..99fa34969 100644
--- a/images/macos/tests/Linters.Tests.ps1
+++ b/images/macos/tests/Linters.Tests.ps1
@@ -3,7 +3,7 @@ Import-Module "$PSScriptRoot/../helpers/Tests.Helpers.psm1" -DisableNameChecking
$os = Get-OSVersion
Describe "SwiftLint" {
- It "SwiftLint" -Skip:($os.IsHighSierra) {
+ It "SwiftLint" {
"swiftlint version" | Should -ReturnZeroExitCode
}
}
\ No newline at end of file
diff --git a/images/macos/tests/Rust.Tests.ps1 b/images/macos/tests/Rust.Tests.ps1
index 405724d53..585271830 100644
--- a/images/macos/tests/Rust.Tests.ps1
+++ b/images/macos/tests/Rust.Tests.ps1
@@ -1,6 +1,6 @@
$os = Get-OSVersion
-Describe "Rust" -Skip:($os.IsHighSierra) {
+Describe "Rust" {
Context "Rust" {
It "Rustup is installed" {
"rustup --version" | Should -ReturnZeroExitCode
diff --git a/images/macos/tests/System.Tests.ps1 b/images/macos/tests/System.Tests.ps1
index 5b6b14e31..71b6d48f6 100644
--- a/images/macos/tests/System.Tests.ps1
+++ b/images/macos/tests/System.Tests.ps1
@@ -17,7 +17,7 @@ Describe "Certificate" {
}
}
-Describe "Audio device" -Skip:($os.IsHighSierra -or $os.IsMonterey) {
+Describe "Audio device" -Skip:($os.IsMonterey) {
It "Sox is installed" {
"sox --version" | Should -ReturnZeroExitCode
}
@@ -35,7 +35,7 @@ Describe "Audio device" -Skip:($os.IsHighSierra -or $os.IsMonterey) {
}
}
-Describe "Screen Resolution" -Skip:($os.IsHighSierra) {
+Describe "Screen Resolution" {
It "Screen Resolution" {
system_profiler SPDisplaysDataType | Select-String "Resolution" | Should -Match "1176 x 885|1920 x 1080"
}
diff --git a/images/macos/tests/Toolcache.Tests.ps1 b/images/macos/tests/Toolcache.Tests.ps1
index 8d3d558f7..aaeb8db9a 100644
--- a/images/macos/tests/Toolcache.Tests.ps1
+++ b/images/macos/tests/Toolcache.Tests.ps1
@@ -142,7 +142,7 @@ Describe "Toolcache" {
}
}
- Context "Node" -Skip:($os.IsHighSierra) {
+ Context "Node" {
$nodeDirectory = Join-Path $toolcacheDirectory "node"
$nodePackage = $packages | Where-Object { $_.ToolName -eq "node" } | Select-Object -First 1
$testCase = @{ NodeDirectory = $nodeDirectory }
@@ -192,7 +192,7 @@ Describe "Toolcache" {
}
}
- Context "Go" -Skip:($os.IsHighSierra) {
+ Context "Go" {
$goDirectory = Join-Path $toolcacheDirectory "go"
$goPackage = $packages | Where-Object { $_.ToolName -eq "go" } | Select-Object -First 1
$testCase = @{ GoDirectory = $goDirectory }
diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1
index 73d86bb49..411eb041e 100644
--- a/images/macos/tests/Xcode.Tests.ps1
+++ b/images/macos/tests/Xcode.Tests.ps1
@@ -34,7 +34,7 @@ Describe "Xcode" {
}
Context "Additional tools" {
- It "Xcode tools are installed" -TestCases $testCases -Skip:($os.IsHighSierra) {
+ It "Xcode tools are installed" -TestCases $testCases {
$TOOLS_NOT_INSTALLED_EXIT_CODE = 69
$xcodebuildPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "xcodebuild"
$result = Get-CommandResult "$xcodebuildPath -checkFirstLaunchStatus"
diff --git a/images/macos/toolsets/toolset-10.13.json b/images/macos/toolsets/toolset-10.13.json
deleted file mode 100644
index 169b4c5fb..000000000
--- a/images/macos/toolsets/toolset-10.13.json
+++ /dev/null
@@ -1,296 +0,0 @@
-{
- "xcode": {
- "default": "10.1",
- "versions": [
- { "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" },
- { "link": "9.4", "version": "9.4.0", "symlinks": ["9.4_beta"] },
- { "link": "9.3.1", "version": "9.3.1" },
- { "link": "9.3", "version": "9.3.0", "symlinks": ["9.3_beta"] },
- { "link": "9.2", "version": "9.2.0" },
- { "link": "9.1", "version": "9.1.0" },
- { "link": "9", "version": "9.0.0" },
- { "link": "8.3.3", "version": "8.3.3" },
- { "link": "8.2.1", "version": "8.2.1" },
- { "link": "8.1", "version": "8.1.0" },
- { "link": "8", "version": "8.0.0" }
- ]
- },
- "xamarin": {
- "vsmac": "8.3.11.1",
- "mono-versions": [
- "6.4.0.208", "6.0.0.334", "5.18.1.3", "5.16.1.0", "5.12.0.309", "5.10.1.57", "5.8.1.0", "5.4.1.7", "5.2.0.224", "5.0.1.1", "4.8.1.0"
- ],
- "ios-versions": [
- "13.6.0.12", "13.4.0.2", "13.2.0.47", "12.14.0.114", "12.10.0.157", "12.8.0.2", "12.6.0.25", "12.2.1.16", "12.0.0.15", "11.14.0.13", "11.12.0.4", "11.9.1.24", "11.8.0.20", "11.6.1.4", "11.2.0.11", "11.0.0.0", "10.10.0.36", "10.6.0.10"
- ],
- "mac-versions": [
- "6.6.0.12", "6.4.0.2", "6.2.0.47", "5.16.1.24", "5.10.0.157", "5.8.0.0", "5.6.0.25", "5.3.1.28", "5.2.1.16" , "4.6.0.13", "4.4.1.193", "4.2.1.28", "4.0.0.216", "3.8.0.49", "3.6.3.3", "3.4.0.36", "3.0.0.398"
- ],
- "android-versions": [
- "10.0.6.2", "9.4.1.0", "9.3.0-23", "9.2.3-0", "9.1.8-0", "9.0.0-20", "8.3.3-2", "8.2.0-16", "8.1.5-0", "8.0.0-33", "7.4.5-1", "7.3.1-2", "7.1.0-43"
- ],
- "bundle-default": "5_12_0",
- "bundles": [
- {
- "symlink": "6_4_2",
- "mono": "6.4",
- "ios": "13.6",
- "mac": "6.6",
- "android": "10.0"
- },
- {
- "symlink": "6_4_1",
- "mono": "6.4",
- "ios": "13.4",
- "mac": "6.4",
- "android": "10.0"
- },
- {
- "symlink": "6_4_0",
- "mono": "6.4",
- "ios": "13.2",
- "mac": "6.2",
- "android": "10.0"
- },
- {
- "symlink": "6_0_0",
- "mono": "6.0",
- "ios": "12.14",
- "mac": "5.16",
- "android": "9.4"
- },
- {
- "symlink": "5_18_3",
- "mono": "5.18",
- "ios": "12.10",
- "mac": "5.10",
- "android": "9.3"
- },
- {
- "symlink": "5_18_2",
- "mono": "5.18",
- "ios": "12.8",
- "mac": "5.8",
- "android": "9.2"
- },
- {
- "symlink": "5_18_1",
- "mono": "5.18",
- "ios": "12.6",
- "mac": "5.6",
- "android": "9.2"
- },
- {
- "symlink": "5_16_0_0",
- "mono": "5.16",
- "ios": "12.2",
- "mac": "5.2",
- "android": "9.1"
- },
- {
- "symlink": "5_16_0",
- "mono": "5.16",
- "ios": "12.2",
- "mac": "5.2",
- "android": "9.1"
- },
- {
- "symlink": "5_12_0_3",
- "mono": "5.12",
- "ios": "12.2",
- "mac": "5.3",
- "android": "9.0"
- },
- {
- "symlink": "5_12_0_XC10_PRE",
- "mono": "5.12",
- "ios": "12.0",
- "mac": "5.2",
- "android": "9.0"
- },
- {
- "symlink": "5_12_0",
- "mono": "5.12",
- "ios": "11.14",
- "mac": "4.6",
- "android": "9.0"
- },
- {
- "symlink": "5_10_1",
- "mono": "5.10",
- "ios": "11.12",
- "mac": "4.4",
- "android": "8.3"
- },
- {
- "symlink": "5_8_1",
- "mono": "5.8",
- "ios": "11.9",
- "mac": "4.2",
- "android": "8.2"
- },
- {
- "symlink": "5_8_0",
- "mono": "5.8",
- "ios": "11.8",
- "mac": "4.2",
- "android": "8.2"
- },
- {
- "symlink": "5_4_1",
- "mono": "5.4",
- "ios": "11.6",
- "mac": "4.0",
- "android": "8.1"
- },
- {
- "symlink": "5_4_0",
- "mono": "5.4",
- "ios": "11.2",
- "mac": "3.8",
- "android": "8.0"
- },
- {
- "symlink": "5_2_0",
- "mono": "5.2",
- "ios": "11.0",
- "mac": "3.6",
- "android": "7.4"
- },
- {
- "symlink": "Legacy_5_0_1",
- "mono": "5.0",
- "ios": "10.10",
- "mac": "3.4",
- "android": "7.3"
- },
- {
- "symlink": "Legacy_4_8_1",
- "mono": "4.8",
- "ios": "10.6",
- "mac": "3.0",
- "android": "7.1"
- }
- ]
- },
- "java": {
- "default": "8",
- "versions": [
- "8", "11", "12", "13", "14"
- ]
- },
- "android": {
- "platform_min_version": "15",
- "build_tools_min_version": "17.0.0",
- "extra-list": [
- "android;m2repository", "google;m2repository", "google;google_play_services", "intel;Hardware_Accelerated_Execution_Manager", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta1", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta2", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta3", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta4", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0-beta5", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.0", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.1", "m2repository;com;android;support;constraint;constraint-layout-solver;1.0.2", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta1", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta2", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta3", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta4", "m2repository;com;android;support;constraint;constraint-layout;1.0.0-beta5", "m2repository;com;android;support;constraint;constraint-layout;1.0.0", "m2repository;com;android;support;constraint;constraint-layout;1.0.1", "m2repository;com;android;support;constraint;constraint-layout;1.0.2"
- ],
- "addon-list": [
- "addon-google_apis-google-24", "addon-google_apis-google-23", "addon-google_apis-google-22", "addon-google_apis-google-21"
- ],
- "additional-tools": [
- "cmake;3.10.2.4988404"
- ],
- "ndk": {
- "lts": "21",
- "latest": "22"
- }
- },
- "powershellModules": [
- {
- "name": "Az",
- "versions": [
- "4.8.0"
- ]
- },
- {"name": "MarkdownPS"},
- {"name": "Pester"},
- {"name": "PSScriptAnalyzer"}
- ],
- "npm": {
- "global_packages": [
- { "name": "npm@3" },
- { "name": "omelette@0.4.14" },
- { "name": "appcenter-cli@^1.0.0", "test": "appcenter --version" },
- { "name": "node-gyp" }
- ]
- },
- "brew": {
- "common_packages": [
- "aliyun-cli",
- "ant",
- "aria2",
- "bats",
- "bazelisk",
- "carthage",
- "cmake",
- "gh",
- "gnupg",
- "gnu-tar",
- "helm",
- "libpq",
- "llvm",
- "p7zip",
- "packer",
- "parallel",
- "perl",
- "subversion",
- "xctool",
- "zstd"
- ],
- "cask_packages": [
- "julia",
- "r",
- "vagrant",
- "virtualbox"
- ]
- },
- "toolcache": [
- {
- "name": "PyPy",
- "arch": "x64",
- "platform" : "darwin",
- "versions": [
- "2.7",
- "3.6"
- ]
- },
- {
- "name": "Ruby",
- "arch": "x64",
- "versions": [
- "2.4.*",
- "2.5.*",
- "2.6.*",
- "2.7.*"
- ]
- }
- ],
- "pipx": [
- {
- "package": "yamllint",
- "cmd": "yamllint --version"
- }
- ],
- "dotnet": {
- "versions": [
- "2.1"
- ]
- },
- "ruby": {
- "default": "2.7",
- "rubygems": [
- "xcode-install",
- "cocoapods",
- "nomad-cli",
- "xcpretty",
- "bundler",
- "fastlane"
- ]
- },
- "go": {
- "default": "1.15"
- }
-}
\ No newline at end of file