Remove all macOS-10.15 related code (#7078)

images/macos/provision/configuration/configure-machine.sh

@@ -36,9 +36,9 @@ defaults write com.apple.VoiceOver4/default SCREnableAppleScript -bool YES
 # Confirm that the correct intermediate certificate is installed by verifying the expiration date is set to 2030.
 # sudo security delete-certificate -Z FF6797793A3CD798DC5B2ABEF56F73EDC9F83A64 /Library/Keychains/System.keychain
 # Big Sur requires user interaction to add a cert https://developer.apple.com/forums/thread/671582, we need to use a workaround with SecItemAdd swift method
-if ! is_Catalina; then
-    swiftc "${HOME}/image-generation/add-certificate.swift"
-fi
+
+swiftc "${HOME}/image-generation/add-certificate.swift"
+
 
 certs=(
     AppleWWDRCAG3.cer
@@ -49,11 +49,7 @@ for cert in ${certs[@]}; do
     cert_path="${HOME}/${cert}"
     curl "https://www.apple.com/certificateauthority/${cert}" --output ${cert_path} --silent
 
-    if is_Catalina; then
-        sudo security add-trusted-cert -d -r unspecified -k /Library/Keychains/System.keychain ${cert_path}
-    else
-        sudo ./add-certificate ${cert_path}
-    fi
+    sudo ./add-certificate ${cert_path}
 
     rm ${cert_path}
 done

images/macos/provision/configuration/finalize-vm.sh

@@ -5,14 +5,6 @@ source ~/utils/utils.sh
 # Close all finder windows because they can interfere with UI tests
 close_finder_window
 
-if is_Catalina; then
-    # Ignore available updates to prevent system pop-ups
-    updateName=$(softwareupdate -l | grep "Title: " | awk -F[:,] '{print $2}' | awk '{$1=$1};1') || true
-    if [ ! -z "$updateName" ]; then
-        sudo softwareupdate --ignore "$updateName"
-    fi
-fi
-
 # Remove Parallels Desktop
 # https://github.com/actions/runner-images/issues/6105
 if is_Monterey; then

images/macos/provision/configuration/preimagedata.sh

@@ -8,11 +8,8 @@ os_name=$(sw_vers -productName)
 os_version=$(sw_vers -productVersion)
 os_build=$(sw_vers -buildVersion)
 label_version=$(echo $os_version | cut -d. -f1,2)
-if is_Catalina; then
-    label_version=$(echo $os_version | cut -d. -f1,2)
-else
-    label_version=$(echo $os_version | cut -d. -f1)
-fi
+label_version=$(echo $os_version | cut -d. -f1)
+
 image_label="macos-${label_version}"
 release_label="macOS-${label_version}"
 software_url="https://github.com/actions/runner-images/blob/${release_label}/${image_version}/images/macos/${image_label}-Readme.md"

images/macos/provision/core/android-toolsets.sh

@@ -97,10 +97,6 @@ done
 # The Android Emulator uses the built-in Hypervisor.Framework by default, and falls back to using Intel HAXM if Hypervisor.Framework fails to initialize
 # https://developer.android.com/studio/run/emulator-acceleration#vm-mac
 # The installation doesn't work properly on macOS Big Sur, /dev/HAX is not created
-if is_Catalina; then
-    chmod +x $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh
-    sudo $ANDROID_HOME/extras/intel/Hardware_Accelerated_Execution_Manager/silent_install.sh
-fi
 
 for addon_name in "${ANDROID_ADDON_LIST[@]}"
 do

images/macos/provision/core/audiodevice.sh

@@ -9,20 +9,12 @@ brew_smart_install "sox"
 
 # Big Sur doesn't support soundflower installation without user interaction https://github.com/mattingalls/Soundflower/releases/tag/2.0b2
 # Install blackhole-2ch for Big Sur instead
-if is_Catalina; then
-    echo "install soundflower"
-    brew install --cask soundflower
 
-    echo "set Soundflower (2ch) as input/output device"
-    SwitchAudioSource -s "Soundflower (2ch)" -t input
-    SwitchAudioSource -s "Soundflower (2ch)" -t output
-else
-    echo "install blackhole-2ch"
-    brew_smart_install "blackhole-2ch"
+echo "install blackhole-2ch"
+brew_smart_install "blackhole-2ch"
 
-    echo "set BlackHole 2ch as input/output device"
-    SwitchAudioSource -s "BlackHole 2ch" -t input
-    SwitchAudioSource -s "BlackHole 2ch" -t output
-fi
+echo "set BlackHole 2ch as input/output device"
+SwitchAudioSource -s "BlackHole 2ch" -t input
+SwitchAudioSource -s "BlackHole 2ch" -t output
 
 invoke_tests "System" "Audio Device"

images/macos/provision/core/graalvm.sh

@@ -8,12 +8,6 @@ exportPath=$(echo /Library/Java/JavaVirtualMachines/graalvm-ce-java*/Contents/Ho
 echo "Setting up GRAALVM_11_ROOT variable to ${exportPath}"
 echo "export GRAALVM_11_ROOT=${exportPath}" >> "${HOME}/.bashrc"
 
-# GraalVM not being signed and notarized yet on macOS Catalina
-if is_Catalina; then
-    quarantinePath=$(echo /Library/Java/JavaVirtualMachines/graalvm-ce-java*)
-    sudo xattr -rd com.apple.quarantine $quarantinePath
-fi
-
 # Install Native Image
 $exportPath/gu install native-image
 

images/macos/provision/core/openjdk.sh

@@ -77,14 +77,6 @@ for jdkVendor in ${jdkVendors[@]}; do
     done
 done
 
-# Big Sur or newer does not have these versions of Adopt.
-# Also hardcode these versions as they only exist for Adopt
-if is_Catalina; then
-    for adoptVersionToInstall in 12 13 14; do
-        createEnvironmentVariable ${adoptVersionToInstall} "Adopt"
-    done
-fi
-
 echo Installing Maven...
 brew_smart_install "maven"
 

images/macos/provision/core/powershell.sh

@@ -8,9 +8,8 @@ psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contain
 download_with_retries $psDownloadUrl "/tmp" "powershell.pkg"
 
 # Work around the issue on macOS Big Sur 11.5 or higher for possible error message ("can't be opened because Apple cannot check it for malicious software") when installing the package
-if ! is_Catalina; then
-    sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg
-fi
+sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg
+
 
 sudo installer -pkg /tmp/powershell.pkg -target /
 

images/macos/provision/core/swiftlint.sh

@@ -3,7 +3,7 @@ source ~/utils/utils.sh
 
 echo "Install SwiftLint"
 # SwiftLint now requires Swift 5.6 or higher to build, and macOS 12 or higher to run https://github.com/realm/SwiftLint/releases/tag/0.49.0
-if is_Less_Monterey; then
+if is_BigSur; then
     version="0.48.0"
 else
     version="latest"

images/macos/provision/core/xamarin.sh

@@ -64,11 +64,6 @@ createBundleLink $CURRENT_SDK_SYMLINK "Current"
 # Fix nuget in some mono versions because of known bugs
 #
 
-if is_Catalina; then
-  # Fix Mono issue with default nuget: https://github.com/mono/mono/issues/17637
-  installNuget "6.4.0" "5.3.1"
-fi
-
 # Creating UWP Shim to hack UWP build failure
 createUWPShim
 

images/macos/provision/utils/utils.sh

@@ -63,22 +63,6 @@ is_BigSur() {
     fi
 }
 
-is_Catalina() {
-    if [ "$OSTYPE" = "darwin19" ]; then
-        true
-    else
-        false
-    fi
-}
-
-is_Less_Monterey() {
-    if is_Catalina || is_BigSur; then
-        true
-    else
-        false
-    fi
-}
-
 is_Veertu() {
     if [ -d "/Library/Application Support/Veertu" ]; then
         true
@@ -116,9 +100,7 @@ brew_cask_install_ignoring_sha256() {
 }
 
 get_brew_os_keyword() {
-    if is_Catalina; then
-        echo "catalina"
-    elif is_BigSur; then
+    if is_BigSur; then
         echo "big_sur"
     elif is_Monterey; then
         echo "monterey"