[macOS] Delete more software from Big Sur (#9488)

images/macos/scripts/build/install-aws-tools.sh

@@ -10,9 +10,11 @@ echo "Installing aws..."
 awscliv2_pkg_path=$(download_with_retry "https://awscli.amazonaws.com/AWSCLIV2.pkg")
 sudo installer -pkg "$awscliv2_pkg_path" -target /
 
+if ! is_BigSur; then
     echo "Installing aws sam cli..."
     brew tap aws/tap
     brew_smart_install aws-sam-cli
+fi
 
 echo "Install aws cli session manager"
 brew install --cask session-manager-plugin

images/macos/scripts/build/install-common-utils.sh

@@ -95,8 +95,10 @@ if is_Monterey; then
     echo "export PARALLELS_DMG_URL=$url" >> ${HOME}/.bashrc
 fi
 
+if ! is_BigSur; then
     # Install Azure DevOps extension for Azure Command Line Interface
     az extension add -n azure-devops
+fi
 
 # Invoke tests for all basic tools
 invoke_tests "BasicTools"

images/macos/scripts/build/install-git.sh

@@ -11,6 +11,8 @@ brew_smart_install "git"
 
 git config --global --add safe.directory "*"
 
+
+if ! is_BigSur; then
     echo "Installing Git LFS"
     brew_smart_install "git-lfs"
 
@@ -18,6 +20,7 @@ brew_smart_install "git-lfs"
     git lfs install
     # Update system git config
     sudo git lfs install --system
+fi
 
 echo "Disable all the Git help messages..."
 git config --global advice.pushUpdateRejected false

images/macos/scripts/docs-gen/Generate-SoftwareReport.ps1

@@ -64,7 +64,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) {
 if ((-not $os.IsVenturaArm64) -and (-not $os.IsSonomaArm64)) {
     $languageAndRuntime.AddToolVersion("Python3", $(Get-Python3Version))
 }
-if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) {
+if ((-not $os.IsVentura) -and (-not $os.IsSonoma) -and (-not $os.IsBigSur)) {
     $languageAndRuntime.AddToolVersion("R", $(Get-RVersion))
 }
 $languageAndRuntime.AddToolVersion("Ruby", $(Get-RubyVersion))
@@ -120,7 +120,9 @@ $utilities.AddToolVersion("bazelisk", $(Get-BazeliskVersion))
 $utilities.AddToolVersion("bsdtar", $(Get-BsdtarVersion))
 $utilities.AddToolVersion("Curl", $(Get-CurlVersion))
 $utilities.AddToolVersion("Git", $(Get-GitVersion))
+if (-not $os.IsBigSur) {
     $utilities.AddToolVersion("Git LFS", $(Get-GitLFSVersion))
+}
 $utilities.AddToolVersion("GitHub CLI", $(Get-GitHubCLIVersion))
 $utilities.AddToolVersion("GNU Tar", $(Get-GnuTarVersion))
 $utilities.AddToolVersion("GNU Wget", $(Get-WgetVersion))
@@ -165,10 +167,14 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) {
     $tools.AddToolVersion("App Center CLI", $(Get-AppCenterCLIVersion))
 }
 $tools.AddToolVersion("AWS CLI", $(Get-AWSCLIVersion))
+if (-not $os.IsBigSur) {
     $tools.AddToolVersion("AWS SAM CLI", $(Get-AWSSAMCLIVersion))
+}
 $tools.AddToolVersion("AWS Session Manager CLI", $(Get-AWSSessionManagerCLIVersion))
+if (-not $os.IsBigSur) {
     $tools.AddToolVersion("Azure CLI", $(Get-AzureCLIVersion))
     $tools.AddToolVersion("Azure CLI (azure-devops)", $(Get-AzureDevopsVersion))
+}
 $tools.AddToolVersion("Bicep CLI", $(Get-BicepVersion))
 if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) {
     $tools.AddToolVersion("Cabal", $(Get-CabalVersion))
@@ -221,6 +227,7 @@ $toolcache = $installedSoftware.AddHeader("Cached Tools")
 $toolcache.AddNodes($(Build-ToolcacheSection))
 
 # Rust
+if (-not $os.IsBigSur) {
 $rust = $installedSoftware.AddHeader("Rust Tools")
 $rust.AddToolVersion("Cargo", $(Get-RustCargoVersion))
 $rust.AddToolVersion("Rust", $(Get-RustVersion))
@@ -236,6 +243,7 @@ if ((-not $os.IsVentura) -and (-not $os.IsSonoma)) {
 }
 $rustPackages.AddToolVersion("Clippy", $(Get-RustClippyVersion))
 $rustPackages.AddToolVersion("Rustfmt", $(Get-RustfmtVersion))
+}
 
 # PowerShell
 $powerShell = $installedSoftware.AddHeader("PowerShell Tools")

images/macos/scripts/tests/BasicTools.Tests.ps1

@@ -2,13 +2,13 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
 
 $os = Get-OSVersion
 
-Describe "Azure CLI" {
+Describe "Azure CLI" -Skip:($os.IsBigSur) {
     It "Azure CLI" {
         "az -v" | Should -ReturnZeroExitCode
     }
 }
 
-Describe "Azure DevOps CLI" {
+Describe "Azure DevOps CLI" -Skip:($os.IsBigSur) {
     It "az devops" {
         "az devops -h" | Should -ReturnZeroExitCode
     }
@@ -159,7 +159,7 @@ Describe "virtualbox" -Skip:($os.IsBigSur -or $os.IsVentura -or $os.IsSonoma) {
     }
 }
 
-Describe "R" -Skip:($os.IsVentura -or $os.IsSonoma) {
+Describe "R" -Skip:($os.IsVentura -or $os.IsSonoma -or $os.IsBigSur) {
     It "R" {
         "R --version" | Should -ReturnZeroExitCode
     }

images/macos/scripts/tests/Common.Tests.ps1

@@ -43,7 +43,7 @@ Describe "AWS" {
     It "AWS CLI" {
         "aws --version" | Should -ReturnZeroExitCode
     }
-    It "AWS SAM CLI" {
+    It "AWS SAM CLI" -Skip:($os.IsBigSur) {
         "sam --version" | Should -ReturnZeroExitCode
     }
 

images/macos/scripts/tests/Git.Tests.ps1

@@ -1,10 +1,12 @@
 Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
 
+$os = Get-OSVersion
+
 Describe "Git" {
     It "git is installed" {
         "git --version" | Should -ReturnZeroExitCode
     }
-    It "git lfs is installed" {
+    It "git lfs is installed" -Skip:($os.IsBigSur) {
         "git lfs version" | Should -ReturnZeroExitCode
     }
 }

images/macos/scripts/tests/Rust.Tests.ps1

@@ -2,7 +2,7 @@ Import-Module "$PSScriptRoot/../helpers/Common.Helpers.psm1"
 
 $os = Get-OSVersion
 
-Describe "Rust" {
+Describe "Rust" -Skip:($os.IsBigSur) {
     Context "Rust" {
         It "Rustup is installed" {
             "rustup --version" | Should -ReturnZeroExitCode

images/macos/templates/macOS-11.pkr.hcl

@@ -245,7 +245,6 @@ build {
       "${path.root}/../scripts/build/install-swiftlint.sh",
       "${path.root}/../scripts/build/install-openjdk.sh",
       "${path.root}/../scripts/build/install-aws-tools.sh",
-      "${path.root}/../scripts/build/install-rust.sh",
       "${path.root}/../scripts/build/install-gcc.sh",
       "${path.root}/../scripts/build/install-haskell.sh",
       "${path.root}/../scripts/build/install-cocoapods.sh",

images/macos/toolsets/toolset-11.json

@@ -195,7 +195,6 @@
             "aliyun-cli",
             "ant",
             "aria2",
-            "azure-cli",
             "bazelisk",
             "carthage",
             "cmake",
@@ -218,8 +217,7 @@
             "zlib",
             "libxext",
             "libxft",
-            "tcl-tk",
+            "tcl-tk"
-            "r"
         ],
         "cask_packages": [
             "julia"