Updating readme file for macos-13-arm64 version 20240114.1

Co-authored-by: Image generation service account <[email protected]>
Co-authored-by: Actions service account <[email protected]>

.github/ISSUE_TEMPLATE/announcement.yml

@@ -41,6 +41,7 @@ body:
         - label: macOS 11
         - label: macOS 12
         - label: macOS 13
+        - label: macOS 13 Arm64
         - label: Windows Server 2019
         - label: Windows Server 2022
   - type: textarea

.github/ISSUE_TEMPLATE/bug-report.yml

@@ -24,6 +24,7 @@ body:
         - label: macOS 11
         - label: macOS 12
         - label: macOS 13
+        - label: macOS 13 Arm64
         - label: Windows Server 2019
         - label: Windows Server 2022
   - type: textarea

.github/ISSUE_TEMPLATE/tool-request.yml

@@ -62,6 +62,7 @@ body:
         - label: macOS 11
         - label: macOS 12
         - label: macOS 13
+        - label: macOS 13 Arm64
         - label: Windows Server 2019
         - label: Windows Server 2022
   - type: textarea

.github/workflows/ci-cleanup.yml

@@ -1,48 +0,0 @@
-run-name: Cleanup ${{ github.head_ref }}
-on:
-  pull_request_target:
-    types: labeled
-    paths:
-      - 'images/**'
-
-jobs:
-  clean_ci:
-    name: Clean CI runs
-    runs-on: ubuntu-latest
-    permissions:
-      actions: write
-    steps:
-      - env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: pwsh
-        run: |
-          $startDate = Get-Date -UFormat %s
-          $workflows = @("macos11", "macos12", "ubuntu2004", "ubuntu2204", "windows2019", "windows2022")
-          while ($true) {
-            $continue = $false
-            foreach ($wf in $workflows) {
-              $skippedCommand = "gh run list --workflow ${wf}.yml --branch ${{ github.event.pull_request.head.ref }} --repo ${{ github.repository }} --status skipped --json databaseId"
-              $skippedIds = Invoke-Expression -Command $skippedCommand | ConvertFrom-Json | ForEach-Object { $_.databaseId }
-              $skippedIds | ForEach-Object {
-                $deleteCommand = "gh run delete --repo ${{ github.repository }} $_"
-                Invoke-Expression -Command $deleteCommand
-              }
-              $pendingCommand = "gh run list --workflow ${wf}.yml --branch ${{ github.event.pull_request.head.ref }} --repo ${{ github.repository }} --status requested --json databaseId --template '{{ . | len }}'"
-              $pending = Invoke-Expression -Command $pendingCommand
-              if ($pending -gt 0) {
-                Write-Host "Pending for ${wf}.yml: $pending run(s)"
-                $continue = $true
-              }
-            }
-            if ($continue -eq $false) {
-              Write-Host "All done, exiting"
-              break
-            }
-            $curDate = Get-Date -UFormat %s
-            if (($curDate - $startDate) -gt 60) {
-              Write-Host "Reached timeout, exiting"
-              break
-            }
-            Write-Host "Waiting 5 seconds..."
-            Start-Sleep -Seconds 5
-          }

.github/workflows/create_sbom_report.yml

@@ -1,4 +1,4 @@
-name: Create and upload a SBOM to release assets
+name: Create SBOM for the release
 # Inherited variables:
 # github.event.client_payload.agentSpec - Current YAML Label
 # github.event.client_payload.ReleaseID - Current release ID
@@ -14,8 +14,35 @@ defaults:
   run:
     shell: pwsh
 jobs:
-  #Checking image version on available runner
-  version-check:
+  #Checking current release for SBOM
+  sbom-check:
+    outputs:
+      check_status: ${{ steps.check.outputs.status }}
+    runs-on: ubuntu-latest
+    steps:
+    - name: Check release for ${{ github.event.client_payload.ReleaseBranchName }}
+      id: check
+      shell: pwsh
+      run: |
+        $apiUrl = "https://api.github.com/repos/actions/runner-images/releases/${{ github.event.client_payload.ReleaseID }}"
+        $response = Invoke-RestMethod -Uri $apiUrl -Method Get -SkipHttpErrorCheck
+        if ($response.message -ilike "Not Found") {
+          echo "status=release_not_found" >> $env:GITHUB_OUTPUT
+          Write-Error "Release ${{ github.event.client_payload.ReleaseID }} wasn't found"
+          exit 1
+        }
+        foreach ($asset in $response.assets) {
+          if ($asset.name -like '*sbom*') {
+            echo "status=sbom_exists" >> $env:GITHUB_OUTPUT
+            return "Release ${{ github.event.client_payload.ReleaseID }} already contains a SBOM"
+          }
+        }
+        Write-Host "Release has been found, SBOM is not attached, starting generation."
+        echo "status=okay" >> $env:GITHUB_OUTPUT
+  #Generating SBOM
+  building-sbom:
+    needs: sbom-check
+    if: ${{ needs.sbom-check.outputs.check_status == 'okay' }}
     runs-on: ${{ github.event.client_payload.agentSpec }}
     steps:
       - name: Available image version check for ${{ github.event.client_payload.ReleaseBranchName }}
@@ -26,15 +53,9 @@ jobs:
           if ("$imageMajorVersion.$imageMinorVersion" -ne '${{ github.event.client_payload.imageVersion }}') {
             throw "Current runner $imageMajorVersion.$imageMinorVersion image version doesn't match ${{ github.event.client_payload.imageVersion }}."
           }
-  #Install and run SYFT, compress SBOM, upload it to release assets
-  create-sbom:
-    needs: version-check
-    runs-on: ${{ github.event.client_payload.agentSpec }}
-    steps:
-      #Installation section
       - name: Install SYFT tool on Windows
         if: ${{ runner.os == 'Windows' }}
-        run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft v0.84.1
+        run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b D:/syft
       - name: Install SYFT tool on Ubuntu or macOS
         if: ${{ runner.os != 'Windows' }}
         run: curl -sSfL https://raw.githubusercontent.com/anchore/syft/main/install.sh | sh -s -- -b /usr/local/bin
@@ -68,4 +89,4 @@ jobs:
           upload_url: "https://uploads.github.com/repos/actions/runner-images/releases/${{ github.event.client_payload.ReleaseID }}/assets{?name,label}"
           asset_path: ./sbom.json.zip
           asset_name: sbom.${{ github.event.client_payload.agentSpec }}.json.zip
-          asset_content_type: application/zip
+          asset_content_type: application/zip

CONTRIBUTING.md

@@ -6,17 +6,17 @@
 
 Hi there! We're thrilled that you'd like to contribute to this project. Your help is essential for keeping it great.
 
-Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [MIT](LICENSE.md).
+Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [MIT](LICENSE.md) license.
 
-Please note that this project is released with a [Contributor Code of Conduct][code-of-conduct]. By participating in this project you agree to abide by its terms.
+Please note that this project is released with a [Contributor Code of Conduct][code-of-conduct]. By participating in this project, you agree to abide by its terms.
 
 ## Submitting a pull request
 
-1. [Fork][fork] and clone the repository
-1. Create a new branch: `git checkout -b my-branch-name`
-1. Make your changes, ensure that they include steps to install, validate post-install and update software report (please see [How to add new tool](CONTRIBUTING.md#how-to-add-new-tool) for details).
-1. Test your changes by [creating image and deploying a VM](docs/create-image-and-azure-resources.md).
-1. Push to your fork and [submit a pull request][pr]
+1. [Fork][fork] and clone the repository.
+1. Create a new branch: `git checkout -b my-branch-name`.
+1. Make your changes, ensuring that they include steps to install, validate post-install, and update the software report (please see [How to add a new tool](CONTRIBUTING.md#how-to-add-a-new-tool) for details).
+1. Test your changes by [creating an image and deploying a VM](docs/create-image-and-azure-resources.md).
+1. Push to your fork and [submit a pull request][pr].
 
 Here are a few things you can do that will increase the likelihood of your pull request being accepted:
 
@@ -25,40 +25,40 @@ Here are a few things you can do that will increase the likelihood of your pull
 - Keep your change as focused as possible. If there are multiple changes you would like to make that are not dependent upon each other, consider submitting them as separate pull requests.
 - Write [good commit messages](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
 - For new tools:
-  - Make sure that the tool satisfies [Software Guidelines](README.md#software-guidelines).
-  - Create an issue and get an approval from us to add this tool to the image before creating the pull request.
+  - Make sure that the tool satisfies the [Software Guidelines](README.md#software-guidelines).
+  - Create an issue and get approval from us to add this tool to the image before creating the pull request.
 
-## How to add new tool
+## How to add a new tool
 
 ### General rules
 
-- For every new tool add validation scripts and update software report script to make sure that it is included to documentation
-- If the tool is available in other platforms (macOS, Windows, Linux), make sure you include it in as many as possible.
-- If installing a few versions of the tool, consider putting the list of versions in the corresponding `toolset.json` file. It will help other customers to configure their builds flexibly. See [toolset-windows-2019.json](images/windows/toolsets/toolset-2019.json) as example.
-- Use consistent naming across all files
-- Validation scripts should be simple and shouldn't change image content
+- For every new tool, add validation scripts and update the software report script to ensure that it is included in the documentation.
+- If the tool is available on multiple platforms (macOS, Windows, Linux), make sure you include it on as many as possible.
+- If installing multiple versions of the tool, consider putting the list of versions in the corresponding `toolset.json` file. This will help other customers configure their builds flexibly. See [toolset-windows-2019.json](images/windows/toolsets/toolset-2019.json) as an example.
+- Use consistent naming across all files.
+- Validation scripts should be simple and shouldn't change the image content.
 
 ### Windows
 
-- Add a script that will install the tool and put the script in the `scripts/build` folder.  
-There are a bunch of helper functions that could simplify your code: `Choco-Install`, `Install-Binary`, `Install-VsixExtension`, `Start-DownloadWithRetry`, `Test-IsWin19`, `Test-IsWin22` (find the full list of helpers in [ImageHelpers.psm1](images/windows/scripts/helpers/ImageHelpers.psm1)).
-- Add a script that will validate the tool installation and put the script in the `scripts/tests` folder.  
-We use [Pester v5](https://github.com/pester/pester) for validation scripts. If the tests for the tool are complex enough, create a separate `*.Tests.ps1`. Otherwise, use `Tools.Tests.ps1` for simple tests.  
-Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at the end of the installation script to make sure that your tests will be run.
-- Add changes to the software report generator `images/windows/scripts/docs-gen/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Windows2019-Readme.md](images/windows/Windows2019-Readme.md) and uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS).
+- Add a script that will install the tool and put the script in the `scripts/build` folder.
+There are a bunch of helper functions that could simplify your code: `Install-ChocoPackage`, `Install-Binary`, `Install-VSIXFromFile`, `Install-VSIXFromUrl`, `Invoke-DownloadWithRetry`, `Test-IsWin19`, `Test-IsWin22` (find the full list of helpers in [ImageHelpers.psm1](images/windows/scripts/helpers/ImageHelpers.psm1)).
+- Add a script that will validate the tool installation and put the script in the `scripts/tests` folder.
+We use [Pester v5](https://github.com/pester/pester) for validation scripts. If the tests for the tool are complex enough, create a separate `*.Tests.ps1`. Otherwise, use `Tools.Tests.ps1` for simple tests.
+Add `Invoke-PesterTests -TestFile <testFileName> [-TestName <describeName>]` at the end of the installation script to ensure that your tests will be run.
+- Add changes to the software report generator `images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1`. The software report generator is used to generate an image's README file, e.g. [Windows2019-Readme.md](images/windows/Windows2019-Readme.md) and uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS).
 
 ### Ubuntu
 
-- Add script that will install and validate the tool and put the script in the `scripts/build` folder.
+- Add a script that will install and validate the tool and put the script in the `scripts/build` folder.
 Use existing scripts such as [github-cli.sh](images/ubuntu/scripts/build/github-cli.sh) as a starting point.
-  - Use [helpers](images/ubuntu/scripts/helpers/install.sh) to simplify installation process.
-  - Validation part should `exit 1` if any issue with installation.
-- Add changes to the software report generator `images/ubuntu/scripts/docs-gen/SoftwareReport.Generator.ps1`. The software report generator is used to generate an image's README file, e.g. [Ubuntu2004-Readme.md](images/ubuntu/Ubuntu2004-README.md) and it uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS).
+  - Use [helpers](images/ubuntu/scripts/helpers/install.sh) to simplify the installation process.
+  - The validation part should `exit 1` if there is any issue with the installation.
+- Add changes to the software report generator `images/ubuntu/scripts/docs-gen/Generate-SoftwareReport.ps1`. The software report generator is used to generate an image's README file, e.g. [Ubuntu2004-Readme.md](images/ubuntu/Ubuntu2004-README.md) and it uses [MarkdownPS](https://github.com/Sarafian/MarkdownPS).
 
 ### macOS
 
-macOS source lives in this repository and available for everyone. However, macOS image-generation CI doesn't support external contributions yet so we are not able to accept pull-requests for now.
-We are in the process of preparing macOS CI to accept contributions. Until then, we appreciate your patience and ask you continue to make tool requests by filing issues.
+The macOS source lives in this repository and is available for everyone. However, the macOS image-generation CI doesn't support external contributions yet, so we are not able to accept pull requests for now.
+We are in the process of preparing the macOS CI to accept contributions. Until then, we appreciate your patience and ask that you continue to make tool requests by filing issues.
 
 ## Resources
 

docs/create-image-and-azure-resources.md

@@ -2,24 +2,24 @@
 
 The runner-images project uses [Packer](https://www.packer.io/) to generate disk images for Windows 2019/2022 and Ubuntu 20.04/22.04.
 
-Each image is configured by a JSON or HCL2 Packer template that specifies where to build the image (Azure in this case)
+Each image is configured by a HCL2 Packer template that specifies where to build the image (Azure, in this case),
 and what steps to run to install software and prepare the disk.
 
-The Packer process initializes a connection to Azure subscription using Azure CLI and creates temporary resources
-required for the build process: resource group, network interfaces and virtual machine from the "clean" image specified in the template.
+The Packer process initializes a connection to the Azure subscription using Azure CLI and creates temporary resources
+required for the build process: a resource group, network interfaces and a virtual machine from the "clean" image specified in the template.
 
-If the VM deployment succeeds, Packer connects it using ssh or WinRM and begins executing installation steps from the template one-by-one.
-If any step fails, image generation is aborted and the temporary VM is terminated.
-Packer also attempts to cleanup all the temporary resources it created (unless otherwise configured).
+If the VM deployment succeeds, Packer connects to it using SSH or WinRM and begins executing installation steps from the template one-by-one.
+If any step fails, image generation is aborted, and the temporary VM is terminated.
+Packer also attempts to clean up all the temporary resources it created (unless otherwise configured).
 
-After successful completion of all installation steps Packer creates managed image from the temporary VM's disk and deletes the VM.
+After successful completion of all installation steps, Packer creates a managed image from the temporary VM's disk and deletes the VM.
 
-- [Build agent preparation](#build-agent-preparation)
+- [Build Agent Preparation](#build-agent-preparation)
 - [Manual image generation](#manual-image-generation)
-- [Manual image generation customization](#manual-image-generation-customization)
-  - [Network security](#network-security)
-  - [Azure subscription authentication](#azure-subscription-authentication)
-- [Generated machine deployment](#generated-machine-deployment)
+- [Manual Image Generation Customization](#manual-image-generation-customization)
+  - [Network Security](#network-security)
+  - [Azure Subscription Authentication](#azure-subscription-authentication)
+- [Generated Machine Deployment](#generated-machine-deployment)
 - [Automated image generation](#automated-image-generation)
   - [Required variables](#required-variables)
   - [Optional variables](#optional-variables)
@@ -27,15 +27,15 @@ After successful completion of all installation steps Packer creates managed ima
 - [Toolset](#toolset)
 - [Post-generation scripts](#post-generation-scripts)
   - [Running scripts](#running-scripts)
-  - [Script details: Ubuntu](#script-details-ubuntu)
-  - [Script details: Windows](#script-details-windows)
+  - [Script Details: Ubuntu](#script-details-ubuntu)
+  - [Script Details: Windows](#script-details-windows)
 
-## Build agent preparation
+## Build Agent Preparation
 
-Build agent is a machine where Packer process will be started.
-You can use any physical or virtual machine running OS Windows or Linux.
-Of course you may also use [Azure VM](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/quick-create-cli).
-In any case you will need these software installed:
+The build agent is a machine where the Packer process will be started.
+You can use any physical or virtual machine running Windows or Linux OS.
+Of course, you may also use an [Azure VM](https://docs.microsoft.com/en-us/azure/virtual-machines/windows/quick-create-cli).
+In any case, you will need these software installed:
 
 - Packer 1.8.2 or higher.
 
@@ -60,11 +60,12 @@ In any case you will need these software installed:
   In Windows you already have it.
 
   For Linux follow instructions [here](https://learn.microsoft.com/en-us/windows-server/administration/linux-package-repository-for-microsoft-software)
-  to add Microsoft's Linux Software Repository and then install package `powershell`.
+  to add Microsoft's Linux Software Repository and then install the `powershell` package.
+
 - Azure CLI.
 
-  Follow instructions [here](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli).
-  Or if you use Windows you may run this command in Powershell instead:
+  Follow the instructions [here](https://docs.microsoft.com/en-us/cli/azure/install-azure-cli).
+  Or if you use Windows, you may run this command in Powershell instead:
 
   ```powershell
   Invoke-WebRequest -Uri https://aka.ms/installazurecliwindows -OutFile .\AzureCLI.msi
@@ -73,72 +74,72 @@ In any case you will need these software installed:
 
 ## Manual image generation
 
-This repo bundles script that helps generating images in Azure.
-All you need are Azure subscription and build agent configured as described above.
-We suggest starting with building UbuntuMinimal image because it includes only basic software and build in less than 30 minutes.
+This repository includes a script that assists in generating images in Azure.
+All you need is an Azure subscription and a build agent configured as described above.
+We suggest starting with building the UbuntuMinimal image because it includes only basic software and builds in less than 30 minutes.
 
-All the commands below should be executed in Powershell.
+All the commands below should be executed in PowerShell.
 
-First clone runner-images repository and set current directory to it:
+First, clone the runner-images repository and set the current directory to it:
 
 ```powershell
 git clone https://github.com/actions/runner-images.git
 Set-Location runner-images
 ```
 
-Then import [GenerateResourcesAndImage](../helpers/GenerateResourcesAndImage.ps1) script from `helpers` subdirectory:
+Then, import the [GenerateResourcesAndImage](../helpers/GenerateResourcesAndImage.ps1) script from the `helpers` subdirectory:
 
 ```powershell
 Import-Module .\helpers\GenerateResourcesAndImage.ps1
 ```
 
-Finally, run `GenerateResourcesAndImage` function setting mandatory arguments: image type and where to create resources:
+Finally, run the `GenerateResourcesAndImage` function, setting the mandatory arguments: image type and where to build and store the resulting managed image:
 
-- `SubscriptionId` - your Azure Subscription ID
-- `ResourceGroupName` - name of the resource group that will be created within your subscription (e.g. "imagegen-test")
-- `AzureLocation` - location where resources will be created (e.g. "East US")
-- `ImageType` - what image to build (we suggest choosing "UbuntuMinimal" here, other valid options are "Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204")
+- `SubscriptionId` - your Azure Subscription ID;
+- `ResourceGroupName` - the name of the resource group that will be created within your subscription (e.g., "imagegen-test");
+- `AzureLocation` - the location where resources will be created (e.g., "East US");
+- `ImageType` - the type of image to build (we suggest choosing "UbuntuMinimal" here; other valid options are "Windows2019", "Windows2022", "Ubuntu2004", "Ubuntu2204").
 
-This function automatically creates all required Azure resources and kicks off packer image generation for the selected image type.
+This function automatically creates all required Azure resources and initiates the Packer image generation for the selected image type.
 
-When image is ready you may proceed to [deployment](#generated-machine-deployment)
+When the image is ready, you may proceed to [deployment](#generated-machine-deployment).
 
-## Manual image generation customization
+## Manual Image Generation Customization
 
-Function `GenerateResourcesAndImage` accepts a bunch of arguments that may help you generating image in your specific environment.
+The `GenerateResourcesAndImage` function accepts a number of arguments that may assist you in generating an image in your specific environment.
 
-For example, you may want that all the resources involved in image generation process are tagged.
-In this case pass a HashTable of tags as a value for `Tags` parameter.
+For example, you may want all the resources involved in the image generation process to be tagged.
+In this case, pass a HashTable of tags as a value for the `Tags` parameter.
 
-If you don't want function to authenticate interactively, you should create Service Principal and invoke the function with parameters `AzureClientId`, `AzureClientSecret` and `AzureTenantId`.
-You can find more details [in corresponding section below](#azure-subscription-authentication).
+If you don't want the function to authenticate interactively, you should create a Service Principal and invoke the function with the parameters `AzureClientId`, `AzureClientSecret` and `AzureTenantId`.
+You can find more details in the [corresponding section below](#azure-subscription-authentication).
 
-Use `get-help GenerateResourcesAndImage -Detailed` for the complete list of parameters available.
+Use `get-help GenerateResourcesAndImage -Detailed` for the complete list of available parameters.
 
-### Network security
+### Network Security
 
-To connect to a temporary virtual machine Packer uses WinRM or SSH.
+To connect to a temporary virtual machine, Packer uses WinRM or SSH.
 
-If your build agent is located outside of the Azure subscription where temporary VM is created, the public network interface and public IP address is used.
-Make sure that firewalls are configured properly and WinRM (tcp port 5986) and ssh (tcp port 22) connections are allowed both outgoing for build agent and incoming for temporary VM.
-Also if you don't want temporary VM to be accessible from everywhere, set `RestrictToAgentIpAddress` parameter value to `$true`
-to setup firewall rules allowing access only from your build agent public IP address.
+If your build agent is located outside of the Azure subscription where the temporary VM is created, a public network interface and public IP address are used.
+Make sure that firewalls are configured properly and that WinRM (TCP port 5986) and SSH (TCP port 22) connections are allowed both outgoing for the build agent and incoming for the temporary VM.
+Also, if you don't want the temporary VM to be accessible from everywhere, set the `RestrictToAgentIpAddress` parameter value to `$true`
+to set up firewall rules allowing access only from your build agent's public IP address.
 
-If your build agent and temporary VM are in the same subscription you can configure Packer to connect using private virtual network.
-To achieve that set proper values for environment variables `VNET_RESOURCE_GROUP`, `VNET_NAME` and `VNET_SUBNET`.
+If your build agent and temporary VM are in the same subscription, you can configure Packer to connect using a private virtual network.
+To achieve this, set proper values for the environment variables `VNET_RESOURCE_GROUP`, `VNET_NAME` and `VNET_SUBNET`.
 
-### Azure subscription authentication
+### Azure Subscription Authentication
 
-Packer uses Service Principal to authenticate in Azure infrastructure.
-For more information about Service Principals refer to
+Packer uses a Service Principal to authenticate in Azure infrastructure.
+For more information about Service Principals, refer to the
 [Azure documentation](https://docs.microsoft.com/en-us/azure/active-directory/develop/howto-create-service-principal-portal).
 
-Function `GenerateResourcesAndImage` is able to create Service Principle to be used by Packer.
-It uses Connect-AzAccount cmdlet that invokes interactive authentication process by default.
-If you don't want to use interactive authentication you should create Service Principal with full read-write permissions for selected Azure subscription on your own
-and provide proper values for parameters `AzureClientId`, `AzureClientSecret` and `AzureTenantId`.
+The `GenerateResourcesAndImage` function is able to create a Service Principal to be used by Packer.
+It uses the Connect-AzAccount cmdlet that invokes an interactive authentication process by default.
+If you don't want to use interactive authentication, you should create a Service Principal with full read-write permissions for the selected Azure subscription on your own
+and provide proper values for the parameters `AzureClientId`, `AzureClientSecret` and `AzureTenantId`.
 
-Here is an example of how to create Service Principle using Az Powershell module:
+Here is an example of how to create a Service Principal using the Az PowerShell module:
 
 ```powershell
 $credentials = [Microsoft.Azure.PowerShell.Cmdlets.Resources.MSGraph.Models.ApiV10.MicrosoftGraphPasswordCredential]@{
@@ -160,9 +161,9 @@ Start-Sleep -Seconds 30
 }
 ```
 
-## Generated machine deployment
+## Generated Machine Deployment
 
-After the successful image generation, Virtual Machine can be created from the generated image using [CreateAzureVMFromPackerTemplate](../helpers/CreateAzureVMFromPackerTemplate.ps1) script.
+After successful image generation, a Virtual Machine can be created from the generated image using the [CreateAzureVMFromPackerTemplate](../helpers/CreateAzureVMFromPackerTemplate.ps1) script.
 
 ```powershell
 Import-Module .\helpers\CreateAzureVMFromPackerTemplate.ps1
@@ -172,29 +173,29 @@ CreateAzureVMFromPackerTemplate -SubscriptionId {YourSubscriptionId} -ResourceGr
 
 Where:
 
-- `SubscriptionId` - The Azure subscription Id where resources will be created.
-- `ResourceGroupName` - The Azure resource group name where the Azure virtual machine will be created.
-- `ManagedImageName` - The name of the managed image to be used for the virtual machine creation.
-- `VirtualMachineName` - The name of the virtual machine to be generated.
-- `AdminUserName` - The administrator username for the virtual machine to be created.
-- `AdminPassword` - The administrator password for the virtual machine to be created.
-- `AzureLocation` - The location where the Azure virtual machine will be provisioned. Example: "eastus"
+- `SubscriptionId` - the Azure subscription ID where resources will be created;
+- `ResourceGroupName` - the Azure resource group name where the Azure virtual machine will be created;
+- `ManagedImageName` - the name of the managed image to be used for the virtual machine creation;
+- `VirtualMachineName` - the name of the virtual machine to be generated;
+- `AdminUserName` - the administrator username for the virtual machine to be created;
+- `AdminPassword` - the administrator password for the virtual machine to be created;
+- `AzureLocation` - the location where the Azure virtual machine will be provisioned (e.g., "eastus").
 
-The function creates an Azure VM and generates network resources in Azure to make the VM accessible.
+This function creates an Azure VM and generates network resources in Azure to make the VM accessible.
 
 ## Automated image generation
 
-If you want to generate images automatically (e.g. as a part of CI/CD pipeline)
-you can use Packer directly. To do that you will need:
+If you want to generate images automatically (e.g., as a part of a CI/CD pipeline),
+you can use Packer directly. To do this, you will need:
 
-- A build agent configured as described in
-  [Build agent preparation](#build-agent-preparation) section.
-- Azure subscription and Service Principal configured as described in
-  [Azure subscription authentication](#azure-subscription-authentication) section.
-- Resource group created in your Azure subscription where managed image will be stored.
-- String to be used as password for the user used to install software (Windows only).
+- a build agent configured as described in the
+  [Build agent preparation](#build-agent-preparation) section;
+- an Azure subscription and Service Principal configured as described in the
+  [Azure subscription authentication](#azure-subscription-authentication) section;
+- a resource group created in your Azure subscription where the managed image will be stored;
+- a string to be used as a password for the user used to install software (Windows only).
 
-Then you can invoke Packer in you CI/CD pipeline using the following command:
+Then, you can invoke Packer in your CI/CD pipeline using the following command:
 
 ```powershell
 packer build -var "subscription_id=$SubscriptionId" `
@@ -210,54 +211,54 @@ packer build -var "subscription_id=$SubscriptionId" `
 
 Where:
 
-- `SubscriptionId` - your Azure Subscription ID
-- `ClientId` and `ClientSecret` - Service Principal credentials
-- `TenantId` - Azure Tenant ID
-- `InstallPassword` - password for the user used to install software (Windows only)
-- `Location` - location where resources will be created (e.g. "East US")
-- `ImageName` and `ImageResourceGroupName` - name of the resource group where managed image will be stored
-- `TemplatePath` - path to the Packer template file (e.g. "images/windows/templates/windows-2022.json")
+- `SubscriptionId` - your Azure Subscription ID;
+- `ClientId` and `ClientSecret` - Service Principal credentials;
+- `TenantId` - Azure Tenant ID;
+- `InstallPassword` - password for the user used to install software (Windows only);
+- `Location` - location where resources will be created (e.g., "East US");
+- `ImageName` and `ImageResourceGroupName` - name of the resource group where the managed image will be stored;
+- `TemplatePath` - path to the Packer template file (e.g., "images/windows/templates/windows-2022.pkr.hcl").
 
 ### Required variables
 
-The following variables are required to be passed to Packer process:
+The following variables are required to be passed to the Packer process:
 
 | Template var | Env var | Description
 | ------------ | ------- | -----------
-| `subscription_id` | `ARM_SUBSCRIPTION_ID` | Subscription under which the build will be performed.
+| `subscription_id` | `ARM_SUBSCRIPTION_ID` | The subscription under which the build will be performed.
 | `client_id` | `ARM_CLIENT_ID` | The Active Directory service principal associated with your builder.
 | `client_secret` | `ARM_CLIENT_SECRET` | The password or secret for your service principal; may be omitted if `client_cert_path` is set.
-| `client_cert_path` | `ARM_CLIENT_CERT_PATH` | The location of a PEM file containing a certificate and private key for service principal; may be omitted if `client_secret` is set.
-| `location` | `ARM_RESOURCE_LOCATION` | Azure datacenter in which your VM will build.
-| `managed_image_resource_group_name` | `ARM_RESOURCE_GROUP` | Resource group under which the final artifact will be stored.
+| `client_cert_path` | `ARM_CLIENT_CERT_PATH` | The location of a PEM file containing a certificate and private key for the service principal; may be omitted if `client_secret` is set.
+| `location` | `ARM_RESOURCE_LOCATION` | The Azure datacenter in which your VM will be built.
+| `managed_image_resource_group_name` | `ARM_RESOURCE_GROUP` | The resource group under which the final artifact will be stored.
 
 ### Optional variables
 
 The following variables are optional:
 
-- `managed_image_name` - Name of the managed image to create. If not specified, "Runner-Image-{{ImageType}}" will be used.
-- `build_resource_group_name` - Specify an existing resource group to run the build in it. By default, a temporary resource group will be created and destroyed as part of the build. If you do not have permission to do so, use build_resource_group_name to specify an existing resource group to run the build in it.
-- `object_id` - The object ID for the AAD SP. Will be derived from the oAuth token if empty.
-- `tenant_id` - The Active Directory tenant identifier with which your `client_id` and `subscription_id` are associated. If not specified, `tenant_id` will be looked up using `subscription_id`.
-- `temp_resource_group_name` - Name assigned to the temporary resource group created during the build. If this value is not set, a random value will be assigned. This resource group is deleted at the end of the build.
-- `private_virtual_network_with_public_ip` - This value allows you to set a `virtual_network_name` and obtain a public IP. If this value is not set and `virtual_network_name` is defined Packer is only allowed to be executed from a host on the same subnet / virtual network.
-- `virtual_network_name` - Use a pre-existing virtual network for the VM. This option enables private communication with the VM, no public IP address is used or provisioned (unless you set `private_virtual_network_with_public_ip`).
-- `virtual_network_resource_group_name` - If `virtual_network_name` is set, this value may also be set. If `virtual_network_name` is set, and this value is not set the builder attempts to determine the resource group containing the virtual network. If the resource group cannot be found, or it cannot be disambiguated, this value should be set.
-- `virtual_network_subnet_name` - If `virtual_network_name` is set, this value may also be set. If `virtual_network_name` is set, and this value is not set the builder attempts to determine the subnet to use with the virtual network. If the subnet cannot be found, or it cannot be disambiguated, this value should be set.
+- `managed_image_name` - the name of the managed image to create. If not specified, "Runner-Image-{{ImageType}}" will be used;
+- `build_resource_group_name` - specify an existing resource group to run the build in; by default, a temporary resource group will be created and destroyed as part of the build; if you do not have permission to do so, use `build_resource_group_name` to specify an existing resource group to run the build in;
+- `object_id` - the object ID for the AAD SP; will be derived from the oAuth token if empty;
+- `tenant_id` - the Active Directory tenant identifier with which your `client_id` and `subscription_id` are associated; if not specified, `tenant_id` will be looked up using `subscription_id`;
+- `temp_resource_group_name` - the name assigned to the temporary resource group created during the build; if this value is not set, a random value will be assigned; this resource group is deleted at the end of the build;
+- `private_virtual_network_with_public_ip` - this value allows you to set a `virtual_network_name` and obtain a public IP; if this value is not set and `virtual_network_name` is defined, Packer is only allowed to be executed from a host on the same subnet / virtual network;
+- `virtual_network_name` - use a pre-existing virtual network for the VM; this option enables private communication with the VM, no public IP address is used or provisioned (unless you set `private_virtual_network_with_public_ip`);
+- `virtual_network_resource_group_name` - if `virtual_network_name` is set, this value may also be set; if `virtual_network_name` is set, and this value is not set, the builder attempts to determine the resource group containing the virtual network; if the resource group cannot be found, or it cannot be disambiguated, this value should be set;
+- `virtual_network_subnet_name` - if `virtual_network_name` is set, this value may also be set; if `virtual_network_name` is set, and this value is not set, the builder attempts to determine the subnet to use with the virtual network; if the subnet cannot be found, or it cannot be disambiguated, this value should be set.
 
 ## Builder variables
 
 The `builders` section contains variables for the `azure-arm` builder used in the project. Most of the builder variables are inherited from the `user variables` section, however, the variables can be overwritten to adjust image-generation performance.
 
-- `vm_size` - Size of the VM used for building. This can be changed when you deploy a VM from your image.
-- `image_os` - Type of OS that will be deployed as a temporary VM.
-- `image_version` - Specify version of an OS to boot from.
+- `vm_size` - the size of the VM used for building; this can be changed when you deploy a VM from your image;
+- `image_os` - the type of OS that will be deployed as a temporary VM;
+- `image_version` - specify the version of an OS to boot from.
 
-**Detailed Azure builders documentation can be found in [packer documentation](https://www.packer.io/docs/builders/azure).**
+**Detailed Azure builders documentation can be found in the [packer documentation](https://www.packer.io/docs/builders/azure).**
 
 ## Toolset
 
-Configuration for some installed software is located in `toolset.json` files. These files define the list of Ruby, Python, Go versions, the list of PowerShell modules and VS components that will be installed to image. They can be changed if these tools are not required to reduce image generation time or image size.
+The configuration for some installed software is located in `toolset.json` files. These files define the list of Ruby, Python, Go versions, the list of PowerShell modules and VS components that will be installed on the image. They can be changed if these tools are not required, to reduce image generation time or image size.
 
 Generated tool versions and details can be found in related projects:
 
@@ -267,9 +268,9 @@ Generated tool versions and details can be found in related projects:
 
 ## Post-generation scripts
 
-> :warning: These scripts are intended to run on a VM deployed in Azure
+> :warning: These scripts are intended to be run on a VM deployed in Azure
 
-The user, created during the image generation, does not exist in the result image hence some configuration files related to the user's home directory need to be changed as well as the file permissions for some directories. Scripts for that are located in the `post-gen` folder in the repository:
+The user, created during the image generation, does not exist in the resulting image. Hence, some configuration files related to the user's home directory need to be changed, as well as the file permissions for some directories. Scripts for that are located in the `post-gen` folder in the repository:
 
 - Windows: <https://github.com/actions/runner-images/tree/main/images/windows/assets/post-gen>
 - Linux: <https://github.com/actions/runner-images/tree/main/images/ubuntu/assets/post-gen>
@@ -295,16 +296,16 @@ The scripts are copied to the image during the generation process to the followi
   Get-ChildItem C:\post-generation -Filter *.ps1 | ForEach-Object { & $_.FullName }
   ```
 
-### Script details: Ubuntu
+### Script Details: Ubuntu
 
-- **cleanup-logs.sh** - removes all build process logs from the machine
-- **environment-variables.sh** - replaces `$HOME` with the default user's home directory for environmental variables related to the default user home directory
-- **homebrew-permissions.sh** - Resets homebrew repository directory by running `git reset --hard` to make the working tree clean after chmoding /home and changes the repository directory owner to the current user
-- **rust-permissions.sh** - fixes permissions for the Rust folder. Detailed issue explanation is provided in [runner-images/issues/572](https://github.com/actions/runner-images/issues/572).
+- **cleanup-logs.sh** - removes all build process logs from the machine;
+- **environment-variables.sh** - replaces `$HOME` with the default user's home directory for environment variables related to the default user home directory;
+- **homebrew-permissions.sh** - resets the Homebrew repository directory by running `git reset --hard` to make the working tree clean after changing permissions in /home and changes the repository directory owner to the current user;
+- **rust-permissions.sh** - fixes permissions for the Rust folder; a detailed issue explanation is provided in [runner-images/issues/572](https://github.com/actions/runner-images/issues/572).
 
-### Script details: Windows
+### Script Details: Windows
 
-- **GenerateIISExpressCertificate.ps1** - generates and imports a certificate to run applications with IIS Express through HTTPS
-- **InternetExplorerConfiguration** - turns off the Internet Explorer Enhanced Security feature
-- **Msys2FirstLaunch.ps1** - initializes bash user profile in MSYS2
-- **VSConfiguration.ps1** - performs initial Visual Studio configuration
+- **GenerateIISExpressCertificate.ps1** - generates and imports a certificate to run applications with IIS Express through HTTPS;
+- **InternetExplorerConfiguration.ps1** - turns off the Internet Explorer Enhanced Security feature;
+- **Msys2FirstLaunch.ps1** - initializes the bash user profile in MSYS2;
+- **VSConfiguration.ps1** - performs initial Visual Studio configuration.

docs/debugging-failed-builds.md

@@ -21,7 +21,6 @@ Log into the Azure Portal.  Find that resource group under `Resource groups`.  Y
 ## Step 3: Connect to the VM
 Select the VM in the resource group.  Click `Connect:`
 
-This will download an RDP file.  Open that and enter the credentials found in the JSON file you pass to `packer build`:
+This will download an RDP file.  Open that and enter the credentials found in the HCL2 file you pass to `packer build`:
 
 ![VM credentials screenshot](/docs/resources/vmCredentials.png "VM credentials screenshot")
-

helpers/CreateAzureVMFromPackerTemplate.ps1

@@ -28,7 +28,7 @@ Function CreateAzureVMFromPackerTemplate {
             The location where the Azure virtual machine will be provisioned. Example: "eastus"
 
         .EXAMPLE
-            CreateAzureVMFromPackerTemplate -SubscriptionId {YourSubscriptionId} -ResourceGroupName {ResourceGroupName} -TemplateFile "C:\BuildVmImages\temporaryTemplate.json" -VirtualMachineName "testvm1" -AdminUsername "shady1" -AdminPassword "SomeSecurePassword1" -AzureLocation "eastus"
+            CreateAzureVMFromPackerTemplate -SubscriptionId {SubscriptionId} -ResourceGroupName {ResourceGroupName} -VirtualMachineName "testvm1" -ManagedImageName {ManagedImageName} -AdminUsername "shady1" -AdminPassword "SomeSecurePassword1" -AzureLocation "eastus"
     #>
     param (
         [Parameter(Mandatory = $True)]

helpers/GenerateResourcesAndImage.ps1

@@ -17,20 +17,21 @@ Function Get-PackerTemplatePath {
     )
 
     switch ($ImageType) {
+        # Note: Double Join-Path is required to support PowerShell 5.1
         ([ImageType]::Windows2019) {
-            $relativeTemplatePath = Join-Path "windows" "templates" "windows-2019.json"
+            $relativeTemplatePath = Join-Path (Join-Path "windows" "templates") "windows-2019.pkr.hcl"
         }
         ([ImageType]::Windows2022) {
-            $relativeTemplatePath = Join-Path "windows" "templates" "windows-2022.json"
+            $relativeTemplatePath = Join-Path (Join-Path "windows" "templates") "windows-2022.pkr.hcl"
         }
         ([ImageType]::Ubuntu2004) {
-            $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-20.04.json"
+            $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-20.04.pkr.hcl"
         }
         ([ImageType]::Ubuntu2204) {
-            $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-22.04.pkr.hcl"
+            $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-22.04.pkr.hcl"
         }
         ([ImageType]::UbuntuMinimal) {
-            $relativeTemplatePath = Join-Path "ubuntu" "templates" "ubuntu-minimal.pkr.hcl"
+            $relativeTemplatePath = Join-Path (Join-Path "ubuntu" "templates") "ubuntu-minimal.pkr.hcl"
         }
         default { throw "Unknown type of image" }
     }
@@ -96,8 +97,10 @@ Function GenerateResourcesAndImage {
             This parameter cannot be used in combination with the virtual_network_name packer parameter.
         .PARAMETER Force
             Delete the resource group if it exists without user confirmation.
+            This parameter is deprecated and will be removed in a future release.
         .PARAMETER ReuseResourceGroup
             Reuse the resource group if it exists without user confirmation.
+            This parameter is deprecated and will be removed in a future release.
         .PARAMETER OnError
             Specify how packer handles an error during image creation.
             Options:
@@ -145,10 +148,14 @@ Function GenerateResourcesAndImage {
         [hashtable] $Tags = @{}
     )
 
+    if ($Force -or $ReuseResourceGroup) {
+        Write-Warning "The `ReuseResourceGroup` and `Force` parameters are deprecated and will be removed in a future release. The resource group will be reused when it already exists and an error will be thrown when it doesn't. If you want to delete the resource group, please delete it manually."
+    }
+
     if ($Force -and $ReuseResourceGroup) {
         throw "Force and ReuseResourceGroup cannot be used together."
     }
-    
+
     Show-LatestCommit -ErrorAction SilentlyContinue
 
     # Validate packer is installed
@@ -169,30 +176,20 @@ Function GenerateResourcesAndImage {
         }
 
         Write-Host "Access to packer generated VM will be restricted to agent IP Address: $AgentIp."
-        if ($TemplatePath.Contains("pkr.hcl")) {
-            if ($PSVersionTable.PSVersion.Major -eq 5) {
-                Write-Verbose "PowerShell 5 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses."
-                $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp
-            }
-            elseif ($PSVersionTable.PSVersion.Major -eq 7 -and $PSVersionTable.PSVersion.Minor -le 2) {
-                Write-Verbose "PowerShell 7.0-7.2 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses."
-                $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp
-            }
-            else {
-                $AllowedInboundIpAddresses = '["{0}"]' -f $AgentIp
-            }
+        if ($PSVersionTable.PSVersion.Major -eq 5) {
+            Write-Verbose "PowerShell 5 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses."
+            $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp
+        }
+        elseif ($PSVersionTable.PSVersion.Major -eq 7 -and $PSVersionTable.PSVersion.Minor -le 2) {
+            Write-Verbose "PowerShell 7.0-7.2 detected. Replacing double quotes with escaped double quotes in allowed inbound IP addresses."
+            $AllowedInboundIpAddresses = '[\"{0}\"]' -f $AgentIp
         }
         else {
-            $AllowedInboundIpAddresses = $AgentIp
+            $AllowedInboundIpAddresses = '["{0}"]' -f $AgentIp
         }
     }
     else {
-        if ($TemplatePath.Contains("pkr.hcl")) {
-            $AllowedInboundIpAddresses = "[]"
-        }
-        else {
-            $AllowedInboundIpAddresses = ""
-        }
+        $AllowedInboundIpAddresses = "[]"
     }
     Write-Debug "Allowed inbound IP addresses: $AllowedInboundIpAddresses."
 
@@ -209,19 +206,16 @@ Function GenerateResourcesAndImage {
         $TagsJson = $TagsJson -replace '"', '\"'
     }
     Write-Debug "Tags JSON: $TagsJson."
-    if ($TemplatePath.Contains(".json")) {
-        Write-Verbose "Injecting tags into packer template."
-        if ($Tags) {
-            $BuilderScriptPathInjected = $TemplatePath.Replace(".json", "-temp.json")
-            $PackerTemplateContent = Get-Content -Path $TemplatePath | ConvertFrom-Json
-            $PackerTemplateContent.builders | Add-Member -Name "azure_tags" -Value $Tags -MemberType NoteProperty
-            $PackerTemplateContent | ConvertTo-Json -Depth 3 | Out-File -Encoding Ascii $BuilderScriptPathInjected
-            $TemplatePath = $BuilderScriptPathInjected
-        }
-    }
 
     $InstallPassword = $env:UserName + [System.GUID]::NewGuid().ToString().ToUpper()
 
+    Write-Host "Downloading packer plugins..."
+    & $PackerBinary init $TemplatePath
+
+    if ($LastExitCode -ne 0) {
+        throw "Packer plugins download failed."
+    }
+
     Write-Host "Validating packer template..."
     & $PackerBinary validate `
         "-var=client_id=fake" `
@@ -235,7 +229,7 @@ Function GenerateResourcesAndImage {
         "-var=allowed_inbound_ip_addresses=$($AllowedInboundIpAddresses)" `
         "-var=azure_tags=$($TagsJson)" `
         $TemplatePath
-    
+
     if ($LastExitCode -ne 0) {
         throw "Packer template validation failed."
     }
@@ -248,7 +242,7 @@ Function GenerateResourcesAndImage {
         }
         else {
             Write-Verbose "AzureClientId was provided, will use service principal login."
-            az login --service-principal --username $AzureClientId --password $AzureClientSecret --tenant $AzureTenantId --output none
+            az login --service-principal --username $AzureClientId --password=$AzureClientSecret --tenant $AzureTenantId --output none
         }
         az account set --subscription $SubscriptionId
         if ($LastExitCode -ne 0) {
@@ -283,7 +277,7 @@ Function GenerateResourcesAndImage {
                     # Resource group already exists, ask the user what to do
                     $title = "Resource group '$ResourceGroupName' already exists"
                     $message = "Do you want to delete the resource group and all resources in it?"
-                
+
                     $options = @(
                         [System.Management.Automation.Host.ChoiceDescription]::new("&Yes", "Delete the resource group and all resources in it."),
                         [System.Management.Automation.Host.ChoiceDescription]::new("&No", "Keep the resource group and continue."),
@@ -339,7 +333,7 @@ Function GenerateResourcesAndImage {
             if ($LastExitCode -ne 0) {
                 throw "Failed to create service principal '$ServicePrincipalName'."
             }
-            
+
             $ServicePrincipalAppId = $ServicePrincipal.appId
             $ServicePrincipalPassword = $ServicePrincipal.password
             $TenantId = $ServicePrincipal.tenant
@@ -376,7 +370,7 @@ Function GenerateResourcesAndImage {
         Write-Error $_
     } finally {
         Write-Verbose "`nCleaning up..."
-        
+
         # Remove ADServicePrincipal and ADApplication
         if ($ADCleanupRequired) {
             Write-Host "Removing ADServicePrincipal..."

images.CI/linux-and-win/azure-pipelines/image-generation.yml

@@ -69,14 +69,7 @@ jobs:
         $TemplateDirectoryPath = Join-Path "images" $TemplateDirectoryName | Resolve-Path
 
         $TemplateFileName = "${{ parameters.image_template_name }}"
-        if ($TemplateFileName) {
-          $TemplatePath = Join-Path $TemplateDirectoryPath $TemplateFileName
-        } else {
-          $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.pkr.hcl"
-          if ( -not (Test-Path $TemplatePath) ) {
-              $TemplatePath = Join-Path $TemplateDirectoryPath "$ImageType.json"
-          }
-        }
+        $TemplatePath = Join-Path $TemplateDirectoryPath $TemplateFileName
         Write-Host "##vso[task.setvariable variable=TemplateDirectoryPath;]$TemplateDirectoryPath"
         Write-Host "##vso[task.setvariable variable=TemplatePath;]$TemplatePath"
 

images.CI/linux-and-win/azure-pipelines/ubuntu2004.yml

@@ -18,4 +18,4 @@ jobs:
   parameters:
     image_type: ubuntu2004
     image_readme_name: Ubuntu2004-Readme.md
-    image_template_name: ubuntu-20.04.json
+    image_template_name: ubuntu-20.04.pkr.hcl

images.CI/linux-and-win/azure-pipelines/windows2019.yml

@@ -18,4 +18,4 @@ jobs:
   parameters:
     image_type: windows2019
     image_readme_name: Windows2019-Readme.md
-    image_template_name: windows-2019.json
+    image_template_name: windows-2019.pkr.hcl

images.CI/linux-and-win/azure-pipelines/windows2022.yml

@@ -18,4 +18,4 @@ jobs:
   parameters:
     image_type: windows2022
     image_readme_name: Windows2022-Readme.md
-    image_template_name: windows-2022.json
+    image_template_name: windows-2022.pkr.hcl

images.CI/linux-and-win/build-image.ps1

@@ -22,8 +22,6 @@ if (-not (Test-Path $TemplatePath))
 $ImageTemplateName = [io.path]::GetFileName($TemplatePath).Split(".")[0]
 $InstallPassword = [System.GUID]::NewGuid().ToString().ToUpper()
 
-packer validate -syntax-only $TemplatePath
-
 $SensitiveData = @(
     'OSType',
     'StorageAccountLocation',
@@ -37,6 +35,12 @@ $SensitiveData = @(
 Write-Host "Show Packer Version"
 packer --version
 
+Write-Host "Download packer plugins"
+packer init $TemplatePath
+
+Write-Host "Validate packer template"
+packer validate -syntax-only $TemplatePath
+
 Write-Host "Build $ImageTemplateName VM"
 packer build    -var "client_id=$ClientId" `
                 -var "client_secret=$ClientSecret" `
@@ -50,7 +54,6 @@ packer build    -var "client_id=$ClientId" `
                 -var "virtual_network_name=$VirtualNetworkName" `
                 -var "virtual_network_resource_group_name=$VirtualNetworkRG" `
                 -var "virtual_network_subnet_name=$VirtualNetworkSubnet" `
-                -var "run_validation_diskspace=$env:RUN_VALIDATION_FLAG" `
                 -color=false `
                 $TemplatePath `
         | Where-Object {

images.CI/linux-and-win/cleanup.ps1

@@ -6,7 +6,7 @@ param(
     [Parameter (Mandatory=$true)] [string] $TenantId
 )
 
-az login --service-principal --username $ClientId --password $ClientSecret --tenant $TenantId | Out-Null
+az login --service-principal --username $ClientId --password=$ClientSecret --tenant $TenantId | Out-Null
 az account set --subscription $SubscriptionId | Out-Null
 
 $groupExist = az group exists --name $TempResourceGroupName

images.CI/macos/anka/CreateCleanAnkaTemplate.ps1

@@ -89,41 +89,33 @@ function Invoke-SoftwareUpdate {
         return
     }
 
-    Write-Host "`t[*] Fetching Software Updates ready to install on '$TemplateName' VM:"
-    Show-StringWithFormat $newUpdates
-    $listOfNewUpdates = $($($newUpdates.Split("*")).Split("Title") | Where-Object {$_ -match "Label:"}).Replace("Label: ", '')
-    Write-Host "`t[*] Installing Software Updates on '$TemplateName' VM:"
-    Install-SoftwareUpdate -HostName $ipAddress -listOfUpdates $listOfNewUpdates -Password $Password | Show-StringWithFormat
-
-    # Check if Action: restart
     # Define the next macOS version
     $command = "sw_vers"
     $guestMacosVersion = Invoke-SSHPassCommand -HostName $ipAddress -Command $command
     switch -regex ($guestMacosVersion[1]) {
-        '12.\d' { $nextOSVersion = 'macOS Ventura' }
+        '12.\d' { $nextOSVersion = 'macOS Ventura|macOS Sonoma' }
         '13.\d' { $nextOSVersion = 'macOS Sonoma'  }
     }
-    # Make an array of updates
-    $listOfNewUpdates = $newUpdates.split('*').Trim('')
+
+    Write-Host "`t[*] Fetching Software Updates ready to install on '$TemplateName' VM:"
+    Show-StringWithFormat $newUpdates
+    $listOfNewUpdates = $($($newUpdates.Split("*")).Split("Title").where({$_ -match "Label:"}).Replace("Label: ", '').where({$_ -notmatch $nextOSVersion}))
+    Write-Host "`t[*] Installing Software Updates on '$TemplateName' VM:"
+    Install-SoftwareUpdate -HostName $ipAddress -listOfUpdates $listOfNewUpdates -Password $Password | Show-StringWithFormat
+    Write-Host "`t[*] Sleep 60 seconds before the software updates have been installed"
+    Start-Sleep -Seconds 60
+    Write-Host "`t[*] Waiting for loginwindow process"
+    Wait-LoginWindow -HostName $ipAddress | Show-StringWithFormat
+    # Re-enable AutoLogon after installing a new security software update
+    Invoke-EnableAutoLogon
+
     foreach ($newupdate in $listOfNewUpdates) {
-        # Will be True if the value is not Venture, not empty, and contains "Action: restart" words
-        if ($newupdate.Contains("Action: restart") -and !$newupdate.Contains("$nextOSVersion") -and (-not [String]::IsNullOrEmpty($newupdate))) {
-            Write-Host "`t[*] Sleep 120 seconds before the software updates have been installed"
-            Start-Sleep -Seconds 120
-
-            Write-Host "`t[*] Waiting for loginwindow process"
-            Wait-LoginWindow -HostName $ipAddress | Show-StringWithFormat
-
-            # Re-enable AutoLogon after installing a new security software update
-            Invoke-EnableAutoLogon
-
-            # Check software updates have been installed
-            $updates = Get-SoftwareUpdate -HostName $ipAddress
-            if ($updates.Contains("Action: restart") -and !$updates.Contains("$nextOSVersion")) {
-                Write-Host "`t[x] Software updates failed to install: "
-                Show-StringWithFormat $updates
-                exit 1
-            }
+        # Check software updates have been installed
+        $updates = Get-SoftwareUpdate -HostName $ipAddress
+        if ($updates.Contains("Action: restart") -and !($updates -match $nextOSVersion)) {
+            Write-Host "`t[x] Software updates failed to install: "
+            Show-StringWithFormat $updates
+            exit 1
         }
     }
 
@@ -136,6 +128,7 @@ function Invoke-SoftwareUpdate {
     Invoke-SSHPassCommand -HostName $ipAddress -Command $command | Show-StringWithFormat
 }
 
+
 function Invoke-UpdateSettings {
     param (
         [Parameter(Mandatory)]

images.CI/macos/anka/Service.Helpers.psm1

@@ -266,36 +266,13 @@ function Install-SoftwareUpdate {
         [array] $listOfUpdates,
         [string] $Password
     )
-    # If an update is happening on macOS 12 or 13 we will use the prepared list of updates, otherwise, we will install all updates.
-    $command = "sw_vers"
-    $guestMacosVersion = Invoke-SSHPassCommand -HostName $HostName -Command $command
-    if ($guestMacosVersion[1] -match "12") {
-        foreach ($update in $listOfUpdates) {
-            # Filtering updates that contain "Ventura" word
-            if ($update -notmatch "Ventura") {
-                $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'"
-                Invoke-SSHPassCommand -HostName $HostName -Command $command
-            }
-        }
-    } elseif ($guestMacosVersion[1] -match "13") {
-        $osArch = $(arch)
-        if ($osArch -eq "arm64") {
-            Invoke-SoftwareUpdateArm64 -HostName $HostName -Password $Password -ListOfUpdates $listOfUpdates
-        } else {
-            foreach ($update in $listOfUpdates) {
-                # Filtering updates that contain "Sonoma" word
-                if ($update -notmatch "Sonoma") {
-                    $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'"
-                    Invoke-SSHPassCommand -HostName $HostName -Command $command
-                }
-            }
-        }
+    # If an update is happening on macOS arm64 we will use the additional tool to install updates.
+    $osArch = $(arch)
+    if ($osArch -eq "arm64") {
+        Invoke-SoftwareUpdateArm64 -HostName $HostName -Password $Password -ListOfUpdates $listOfUpdates
     } else {
-        $osArch = $(arch)
-        if ($osArch -eq "arm64") {
-            Invoke-SoftwareUpdateArm64 -HostName $HostName -Password $Password -ListOfUpdates $listOfUpdates
-        } else {
-            $command = "sudo /usr/sbin/softwareupdate --all --install --restart --verbose"
+        foreach ($update in $listOfUpdates) {
+            $command = "sudo /usr/sbin/softwareupdate --restart --verbose --install '$($update.trim())'"
             Invoke-SSHPassCommand -HostName $HostName -Command $command
         }
     }
@@ -348,14 +325,17 @@ function Invoke-WithRetry {
         [int] $RetryCount = 20,
         [int] $Seconds = 60
     )
-
     while ($RetryCount -gt 0) {
-        if ($Command) {
-            $result = & $Command
-        }
+        try {
+            if ($Command) {
+                $result = & $Command
+            }
 
-        if (& $BreakCondition) {
-            return $result
+            if (& $BreakCondition) {
+                return $result
+            }
+        } catch {
+            Write-Host "`t    [!] Error during command execution: $_"
         }
 
         $RetryCount--

images.CI/macos/azure-pipelines/image-generation.yml

@@ -63,6 +63,7 @@ jobs:
           'Using ssh communicator to connect:'
       )
 
+      packer init ${{ parameters.template_path }}
       packer build -on-error=abort `
         -var="vcenter_server=$(vcenter-server-v2)" `
         -var="vcenter_username=$(vcenter-username-v2)" `

images.CI/macos/azure-pipelines/macos11.yml

@@ -19,5 +19,5 @@ jobs:
   parameters:
     image_label: 'macOS Big Sur'
     base_image_name: 'clean-macOS-11-380Gb-runner'
-    template_path: 'templates/macOS-11.json'
+    template_path: 'templates/macOS-11.pkr.hcl'
     target_datastore: 'ds-image'

images.CI/macos/azure-pipelines/macos12.yml

@@ -19,5 +19,5 @@ jobs:
   parameters:
     image_label: 'macOS Monterey'
     base_image_name: 'clean-macOS-12-380Gb-runner'
-    template_path: 'templates/macOS-12.json'
+    template_path: 'templates/macOS-12.pkr.hcl'
     target_datastore: 'ds-image'

images/macos/assets/bootstrap-provisioner/setAutoLogin.sh

@@ -11,7 +11,7 @@ LICENSE_BLOCK
 USERNAME="${1}"
 PW="${2}"
 
-function kcpasswordEncode {
+kcpasswordEncode() {
     #ascii string
     local thisString="${1}"
     local i

images/macos/assets/xamarin-selector/select-xamarin-sdk-v2.sh

@@ -23,7 +23,7 @@ change_framework_version() {
   echo "Select $framework $version"
 
   local countDigit=$(echo "${version}" | grep -o "\." | grep -c "\.")
-  
+
   if [[ countDigit -gt 1 ]]; then
     echo "[WARNING] It is not recommended to specify the exact framework version because your build can be broken with the next patch update. Consider using "major.minor" only format."
   fi
@@ -31,7 +31,7 @@ change_framework_version() {
   local framework_path=$(get_framework_path "$framework")
 
   if [ -d "${framework_path}/${version}" ]; then
-    sudo rm -f "${framework_path}/Current"
+    sudo rm -f ${framework_path}/Current
     sudo ln -s "${framework_path}/${version}" "${framework_path}/Current"
   else
     echo "Invalid framework version ${framework_path}/${version}"
@@ -46,7 +46,7 @@ for arg in "$@"; do
   case $key in
   --mono | --ios | --android | --mac) change_framework_version $key $value ;;
   *)
-  echo "Invalid parameter <${key}>"   
+  echo "Invalid parameter <${key}>"
   exit 1
   ;;
   esac

images/macos/macos-11-Readme.md

@@ -1,12 +1,17 @@
+| Announcements |
+|-|
+| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) |
+| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) |
+***
 # macOS 11
 - OS Version: macOS 11.7.10 (20G1427)
 - Kernel Version: Darwin 20.6.0
-- Image Version: 20231030.1
+- Image Version: 20231216.1
 
 ## Installed Software
 
 ### Language and Runtime
-- .NET Core SDK: 6.0.416, 7.0.102, 7.0.202, 7.0.306, 7.0.403
+- .NET Core SDK: 6.0.417, 7.0.102, 7.0.202, 7.0.306, 7.0.404, 8.0.100
 - Bash 3.2.57(1)-release
 - Clang/LLVM 13.0.0
 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang`
@@ -16,35 +21,35 @@
 - GNU Fortran 10 (Homebrew GCC 10.5.0) - available by `gfortran-10` alias
 - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias
 - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias
-- Julia 1.9.3
-- Kotlin 1.9.10-release-459
-- Go 1.20.10
+- Julia 1.9.4
+- Kotlin 1.9.21-release-633
+- Go 1.20.12
 - Mono 6.12.0.188
-- Node.js 18.18.2
+- Node.js 18.19.0
 - MSBuild 16.10.1.51301 (Mono 6.12.0.188)
-- NVM 0.39.5
-- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.2, 20.9.0
-- Perl 5.38.0
-- PHP 8.2.12
+- NVM 0.39.7
+- NVM - Cached node versions: 16.20.2, 18.19.0, 20.10.0
+- Perl 5.38.2
+- PHP 8.3.0
 - Python 2.7.18
-- Python3 3.12.0
-- R 4.3.1
+- Python3 3.12.1
+- R 4.3.2
 - Ruby 2.7.8p225
 
 ### Package Management
-- Bundler 2.4.21
+- Bundler 2.4.22
 - Carthage 0.39.1
-- CocoaPods 1.14.2
-- Composer 2.6.5
-- Homebrew 4.1.17
-- Miniconda 23.9.0
-- NPM 9.8.1
+- CocoaPods 1.14.3
+- Composer 2.6.6
+- Homebrew 4.1.25
+- Miniconda 23.10.0
+- NPM 10.2.3
 - NuGet 6.3.1.1
 - Pip 20.3.4 (python 2.7)
 - Pip3 23.3.1 (python 3.12)
-- Pipx 1.2.1
-- RubyGems 3.4.21
-- Vcpkg 2023 (build from commit 3715d743a)
+- Pipx 1.3.3
+- RubyGems 3.4.10
+- Vcpkg 2023 (build from commit 0e47c1985)
 - Yarn 1.22.19
 
 #### Environment variables
@@ -55,77 +60,77 @@
 
 ### Project Management
 - Apache Ant 1.10.14
-- Apache Maven 3.9.5
-- Gradle 8.4
-- Sbt 1.9.7
+- Apache Maven 3.9.6
+- Gradle 8.5
+- Sbt 1.9.8
 
 ### Utilities
 - 7-Zip 17.05
-- aria2 1.36.0
-- azcopy 10.21.1
-- bazel 6.4.0
-- bazelisk 1.18.0
+- aria2 1.37.0
+- azcopy 10.21.2
+- bazel 7.0.0
+- bazelisk 1.19.0
 - bsdtar 3.3.2 - available by 'tar' alias
-- Curl 8.4.0
-- Git 2.42.0
-- Git LFS 3.4.0
-- GitHub CLI 2.37.0
+- Curl 8.5.0
+- Git 2.43.0
+- Git LFS 3.4.1
+- GitHub CLI 2.40.1
 - GNU Tar 1.35 - available by 'gtar' alias
 - GNU Wget 1.21.4
 - gpg (GnuPG) 2.4.3
-- helm v3.13.1+g3547a4b
-- ImageMagick 7.1.1-21
-- jq 1.7
+- helm v3.13.3+gc8b9489
+- ImageMagick 7.1.1-23
+- jq 1.7.1
 - mongo 5.0.21
 - mongod 5.0.21
 - Newman 6.0.0
 - OpenSSL 1.1.1w  11 Sep 2023
 - Packer 1.9.4
 - pkg-config 0.29.2
-- PostgreSQL 14.9 (Homebrew)
-- psql (PostgreSQL) 14.9 (Homebrew)
+- PostgreSQL 14.10 (Homebrew)
+- psql (PostgreSQL) 14.10 (Homebrew)
 - Sox 14.4.2
 - Subversion (SVN) 1.14.2
 - Switchaudio-osx 1.2.2
-- yq 4.35.2
+- yq 4.40.5
 - zstd 1.5.5
 
 ### Tools
-- Aliyun CLI 3.0.184
+- Aliyun CLI 3.0.189
 - App Center CLI 2.14.0
-- AWS CLI 2.13.30
-- AWS SAM CLI 1.99.0
-- AWS Session Manager CLI 1.2.497.0
-- Azure CLI 2.53.1
+- AWS CLI 2.15.2
+- AWS SAM CLI 1.105.0
+- AWS Session Manager CLI 1.2.536.0
+- Azure CLI 2.55.0
 - Azure CLI (azure-devops) 0.26.0
-- Bicep CLI 0.22.6
-- Cabal 3.10.1.0
-- Cmake 3.27.7
-- CodeQL Action Bundle 2.15.1
-- Fastlane 2.216.0
-- GHC 9.6.2
-- GHCup 0.1.19.4
+- Bicep CLI 0.24.24
+- Cabal 3.6.2.0
+- Cmake 3.28.0
+- CodeQL Action Bundle 2.15.4
+- Fastlane 2.217.0
+- GHC 9.8.1
+- GHCup 0.1.20.0
 - Jazzy 0.14.4
 - Stack 2.13.1
-- SwiftFormat 0.52.8
+- SwiftFormat 0.52.11
 - Swig 4.1.1
 - Xcode Command Line Tools 13.2.0.0.1.1638488800
 
 ### Linters
 - SwiftLint 0.48.0
-- Yamllint 1.32.0
+- Yamllint 1.33.0
 
 ### Browsers
 - Safari 16.6.1 (16615.3.12.11.5)
 - SafariDriver 16.6.1 (16615.3.12.11.5)
-- Google Chrome 118.0.5993.117
-- Google Chrome for Testing 118.0.5993.70
-- ChromeDriver 118.0.5993.70
-- Microsoft Edge 118.0.2088.76
-- Microsoft Edge WebDriver 118.0.2088.76
-- Mozilla Firefox 119.0
+- Google Chrome 120.0.6099.109
+- Google Chrome for Testing 120.0.6099.71
+- ChromeDriver 120.0.6099.71
+- Microsoft Edge 120.0.2210.77
+- Microsoft Edge WebDriver 120.0.2210.77
+- Mozilla Firefox 120.0.1
 - geckodriver 0.33.0
-- Selenium server 4.14.1
+- Selenium server 4.15.0
 
 #### Environment variables
 | Name            | Value                                 |
@@ -140,7 +145,7 @@
 | 8.0.392+8 (default) | JAVA_HOME_8_X64      |
 | 11.0.21+9           | JAVA_HOME_11_X64     |
 | 17.0.9+9            | JAVA_HOME_17_X64     |
-| 21.0.1+12.0.LTS     | JAVA_HOME_21_X64     |
+| 21.0.1+12.0         | JAVA_HOME_21_X64     |
 
 ### Cached Tools
 
@@ -163,39 +168,38 @@
 - 3.8.18
 - 3.9.18
 - 3.10.13
-- 3.11.6
-- 3.12.0
+- 3.11.7
+- 3.12.1
 
 #### Node.js
-- 14.21.3
 - 16.20.2
-- 18.18.2
-- 20.9.0
+- 18.19.0
+- 20.10.0
 
 #### Go
 - 1.19.13
-- 1.20.10
-- 1.21.3
+- 1.20.12
+- 1.21.5
 
 ### Rust Tools
-- Cargo 1.73.0
-- Rust 1.73.0
-- Rustdoc 1.73.0
+- Cargo 1.74.1
+- Rust 1.74.1
+- Rustdoc 1.74.1
 - Rustup 1.26.0
 
 #### Packages
-- Bindgen 0.68.1
+- Bindgen 0.69.1
 - Cargo-audit 0.18.3
-- Cargo-outdated 0.13.1
+- Cargo-outdated 0.14.0
 - Cbindgen 0.26.0
-- Clippy 0.1.73
+- Clippy 0.1.74
 - Rustfmt 1.6.0-stable
 
 ### PowerShell Tools
-- PowerShell 7.2.16
+- PowerShell 7.2.17
 
 #### PowerShell Modules
-- Az: 10.4.1
+- Az: 11.1.0
 - MarkdownPS: 1.9
 - Pester: 5.5.0
 - PSScriptAnalyzer: 1.21.0
@@ -212,7 +216,7 @@
 | Version        | Build      | Path                                 |
 | -------------- | ---------- | ------------------------------------ |
 | 2019           | 8.10.25.2  | /Applications/Visual Studio 2019.app |
-| 2022 (default) | 17.6.6.408 | /Applications/Visual Studio.app      |
+| 2022 (default) | 17.6.7.417 | /Applications/Visual Studio.app      |
 
 ##### Notes
 ```
@@ -325,19 +329,18 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app"
 | watchOS 8.3 | 13.2.1        | Apple Watch Series 4 - 40mm<br>Apple Watch Series 4 - 44mm<br>Apple Watch Series 5 - 40mm<br>Apple Watch Series 5 - 44mm<br>Apple Watch Series 6 - 40mm<br>Apple Watch Series 6 - 44mm<br>Apple Watch Series 7 - 41mm<br>Apple Watch Series 7 - 45mm                                                                                                                                                                                                                                                                                                                                                                                          |
 
 ### Android
-| Package Name               | Version                                                                                                                                                                                                                                                       |
-| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Android Command Line Tools | 8.0                                                                                                                                                                                                                                                           |
-| Android Emulator           | 32.1.15                                                                                                                                                                                                                                                       |
-| Android SDK Build-tools    | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3                                                                                |
-| Android SDK Platforms      | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) |
-| Android SDK Platform-Tools | 34.0.5                                                                                                                                                                                                                                                        |
-| Android Support Repository | 47.0.0                                                                                                                                                                                                                                                        |
-| CMake                      | 3.10.2<br>3.18.1<br>3.22.1                                                                                                                                                                                                                                    |
-| Google Play services       | 49                                                                                                                                                                                                                                                            |
-| Google Repository          | 58                                                                                                                                                                                                                                                            |
-| NDK                        | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125                                                                                                                                                                                       |
-| SDK Patch Applier v4       | 1                                                                                                                                                                                                                                                             |
+| Package Name               | Version                                                                                                                                                                                                                                                                                   |
+| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Android Command Line Tools | 8.0                                                                                                                                                                                                                                                                                       |
+| Android Emulator           | 33.1.23                                                                                                                                                                                                                                                                                   |
+| Android SDK Build-tools    | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3                                                                                                            |
+| Android SDK Platforms      | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) |
+| Android SDK Platform-Tools | 34.0.5                                                                                                                                                                                                                                                                                    |
+| Android Support Repository | 47.0.0                                                                                                                                                                                                                                                                                    |
+| CMake                      | 3.10.2<br>3.18.1<br>3.22.1                                                                                                                                                                                                                                                                |
+| Google Play services       | 49                                                                                                                                                                                                                                                                                        |
+| Google Repository          | 58                                                                                                                                                                                                                                                                                        |
+| NDK                        | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125                                                                                                                                                                                                                                   |
 
 #### Environment variables
 | Name                    | Value                                               |

images/macos/macos-12-Readme.md

@@ -1,12 +1,18 @@
+| Announcements |
+|-|
+| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) |
+| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) |
+| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) |
+***
 # macOS 12
-- OS Version: macOS 12.7 (21G816)
+- OS Version: macOS 12.7.2 (21G1974)
 - Kernel Version: Darwin 21.6.0
-- Image Version: 20231029.1
+- Image Version: 20240105.3
 
 ## Installed Software
 
 ### Language and Runtime
-- .NET Core SDK: 6.0.416, 7.0.102, 7.0.202, 7.0.306, 7.0.403
+- .NET Core SDK: 6.0.417, 7.0.102, 7.0.202, 7.0.306, 7.0.404, 8.0.100
 - Bash 3.2.57(1)-release
 - Clang/LLVM 14.0.0
 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang`
@@ -16,35 +22,35 @@
 - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias
 - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias
 - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias
-- Julia 1.9.3
-- Kotlin 1.9.10-release-459
-- Go 1.20.10
+- Julia 1.10.0
+- Kotlin 1.9.22-release-704
+- Go 1.20.12
 - Mono 6.12.0.188
-- Node.js 18.18.2
+- Node.js 18.19.0
 - MSBuild 16.10.1.51301 (Mono 6.12.0.188)
-- NVM 0.39.5
-- NVM - Cached node versions: 14.21.3, 16.20.2, 18.18.2, 20.9.0
-- Perl 5.38.0
-- PHP 8.2.12
+- NVM 0.39.7
+- NVM - Cached node versions: 16.20.2, 18.19.0, 20.10.0
+- Perl 5.38.2
+- PHP 8.3.1
 - Python 2.7.18
-- Python3 3.12.0
-- R 4.3.1
+- Python3 3.12.1
+- R 4.3.2
 - Ruby 3.0.6p216
 
 ### Package Management
-- Bundler 2.4.21
+- Bundler 2.5.4
 - Carthage 0.39.1
-- CocoaPods 1.14.2
-- Composer 2.6.5
-- Homebrew 4.1.17
-- Miniconda 23.9.0
-- NPM 9.8.1
+- CocoaPods 1.14.3
+- Composer 2.6.6
+- Homebrew 4.2.2
+- Miniconda 23.11.0
+- NPM 10.2.3
 - NuGet 6.3.1.1
 - Pip 20.3.4 (python 2.7)
-- Pip3 23.3.1 (python 3.12)
-- Pipx 1.2.1
-- RubyGems 3.4.21
-- Vcpkg 2023 (build from commit 06c79a9af)
+- Pip3 23.3.2 (python 3.12)
+- Pipx 1.4.1
+- RubyGems 3.5.4
+- Vcpkg 2023 (build from commit ce46ba877)
 - Yarn 1.22.19
 
 #### Environment variables
@@ -55,77 +61,79 @@
 
 ### Project Management
 - Apache Ant 1.10.14
-- Apache Maven 3.9.5
-- Gradle 8.4
-- Sbt 1.9.7
+- Apache Maven 3.9.6
+- Gradle 8.5
+- Sbt 1.9.8
 
 ### Utilities
 - 7-Zip 17.05
-- aria2 1.36.0
-- azcopy 10.21.1
-- bazel 6.4.0
-- bazelisk 1.18.0
+- aria2 1.37.0
+- azcopy 10.21.2
+- bazel 7.0.0
+- bazelisk 1.19.0
 - bsdtar 3.5.1 - available by 'tar' alias
-- Curl 8.4.0
-- Git 2.42.0
-- Git LFS 3.4.0
-- GitHub CLI 2.37.0
+- Curl 8.5.0
+- Git 2.43.0
+- Git LFS 3.4.1
+- GitHub CLI 2.40.1
 - GNU Tar 1.35 - available by 'gtar' alias
 - GNU Wget 1.21.4
 - gpg (GnuPG) 2.4.3
-- ImageMagick 7.1.1-21
-- jq 1.7
+- ImageMagick 7.1.1-25
+- jq 1.7.1
 - mongo 5.0.21
 - mongod 5.0.21
 - OpenSSL 1.1.1w  11 Sep 2023
 - Packer 1.9.4
 - pkg-config 0.29.2
-- PostgreSQL 14.9 (Homebrew)
-- psql (PostgreSQL) 14.9 (Homebrew)
+- PostgreSQL 14.10 (Homebrew)
+- psql (PostgreSQL) 14.10 (Homebrew)
 - Sox 14.4.2
-- Subversion (SVN) 1.14.2
+- Subversion (SVN) 1.14.3
 - Switchaudio-osx 1.2.2
 - Vagrant 2.4.0
-- VirtualBox 7.0.12r159484
-- yq 4.35.2
+- VirtualBox 6.1.38r153438
+- yq 4.40.5
 - zstd 1.5.5
 
 ### Tools
 - App Center CLI 2.14.0
-- AWS CLI 2.13.30
-- AWS SAM CLI 1.99.0
-- AWS Session Manager CLI 1.2.497.0
-- Azure CLI 2.53.1
+- AWS CLI 2.15.8
+- AWS SAM CLI 1.106.0
+- AWS Session Manager CLI 1.2.536.0
+- Azure CLI 2.55.0
 - Azure CLI (azure-devops) 0.26.0
-- Bicep CLI 0.22.6
-- Cabal 3.6.2.0
-- Cmake 3.27.7
-- CodeQL Action Bundle 2.15.1
-- Colima 0.5.6
-- Fastlane 2.216.0
+- Bicep CLI 0.24.24
+- Cabal 3.10.2.1
+- Cmake 3.28.1
+- CodeQL Action Bundle 2.15.5
+- Colima 0.6.7
+- Fastlane 2.219.0
 - GHC 9.8.1
-- GHCup 0.1.19.4
+- GHCup 0.1.20.0
 - Jazzy 0.14.4
 - Stack 2.13.1
-- SwiftFormat 0.52.8
+- SwiftFormat 0.52.11
 - Swig 4.1.1
+- Xcbeautify 1.3.0
 - Xcode Command Line Tools 14.2.0.0.1.1668646533
+- Xcodes 1.4.1
 
 ### Linters
 - SwiftLint 0.53.0
-- Yamllint 1.32.0
+- Yamllint 1.33.0
 
 ### Browsers
-- Safari 17.0 (17616.1.27.111.22)
-- SafariDriver 17.0 (17616.1.27.111.22)
-- Google Chrome 118.0.5993.117
-- Google Chrome for Testing 118.0.5993.70
-- ChromeDriver 118.0.5993.70
-- Microsoft Edge 118.0.2088.76
-- Microsoft Edge WebDriver 118.0.2088.76
-- Mozilla Firefox 119.0
-- geckodriver 0.33.0
-- Selenium server 4.14.1
+- Safari 17.2.1 (17617.1.17.11.12)
+- SafariDriver 17.2.1 (17617.1.17.11.12)
+- Google Chrome 120.0.6099.199
+- Google Chrome for Testing 120.0.6099.109
+- ChromeDriver 120.0.6099.109
+- Microsoft Edge 120.0.2210.121
+- Microsoft Edge WebDriver 120.0.2210.91
+- Mozilla Firefox 121.0
+- geckodriver 0.34.0
+- Selenium server 4.16.1
 
 #### Environment variables
 | Name            | Value                                 |
@@ -140,7 +148,7 @@
 | 8.0.392+8 (default) | JAVA_HOME_8_X64      |
 | 11.0.21+9           | JAVA_HOME_11_X64     |
 | 17.0.9+9            | JAVA_HOME_17_X64     |
-| 21.0.1+12.0.LTS     | JAVA_HOME_21_X64     |
+| 21.0.1+12.0         | JAVA_HOME_21_X64     |
 
 ### Cached Tools
 
@@ -150,50 +158,49 @@
 - 3.1.4
 
 #### PyPy
-- 2.7.18 [PyPy 7.3.13]
+- 2.7.18 [PyPy 7.3.14]
 - 3.7.13 [PyPy 7.3.9]
 - 3.8.16 [PyPy 7.3.11]
-- 3.9.18 [PyPy 7.3.13]
-- 3.10.13 [PyPy 7.3.13]
+- 3.9.18 [PyPy 7.3.14]
+- 3.10.13 [PyPy 7.3.14]
 
 #### Python
 - 3.7.17
 - 3.8.18
 - 3.9.18
 - 3.10.13
-- 3.11.6
-- 3.12.0
+- 3.11.7
+- 3.12.1
 
 #### Node.js
-- 14.21.3
 - 16.20.2
-- 18.18.2
-- 20.9.0
+- 18.19.0
+- 20.10.0
 
 #### Go
 - 1.19.13
-- 1.20.10
-- 1.21.3
+- 1.20.12
+- 1.21.5
 
 ### Rust Tools
-- Cargo 1.73.0
-- Rust 1.73.0
-- Rustdoc 1.73.0
+- Cargo 1.75.0
+- Rust 1.75.0
+- Rustdoc 1.75.0
 - Rustup 1.26.0
 
 #### Packages
-- Bindgen 0.68.1
+- Bindgen 0.69.1
 - Cargo-audit 0.18.3
-- Cargo-outdated 0.13.1
+- Cargo-outdated 0.14.0
 - Cbindgen 0.26.0
-- Clippy 0.1.73
-- Rustfmt 1.6.0-stable
+- Clippy 0.1.75
+- Rustfmt 1.7.0-stable
 
 ### PowerShell Tools
-- PowerShell 7.2.16
+- PowerShell 7.2.17
 
 #### PowerShell Modules
-- Az: 10.4.1
+- Az: 11.1.0
 - MarkdownPS: 1.9
 - Pester: 5.5.0
 - PSScriptAnalyzer: 1.21.0
@@ -210,7 +217,7 @@
 | Version        | Build      | Path                                 |
 | -------------- | ---------- | ------------------------------------ |
 | 2019           | 8.10.25.2  | /Applications/Visual Studio 2019.app |
-| 2022 (default) | 17.6.6.408 | /Applications/Visual Studio.app      |
+| 2022 (default) | 17.6.7.417 | /Applications/Visual Studio.app      |
 
 ##### Notes
 ```
@@ -326,19 +333,18 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app"
 | watchOS 9.1 | 13.1<br>13.2.1<br>13.3.1<br>13.4.1<br>14.0.1<br>14.1<br>14.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm)                                                                                                                                                                                                                                                                                                                                                     |
 
 ### Android
-| Package Name               | Version                                                                                                                                                                                                                                                       |
-| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Android Command Line Tools | 8.0                                                                                                                                                                                                                                                           |
-| Android Emulator           | 32.1.15                                                                                                                                                                                                                                                       |
-| Android SDK Build-tools    | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0<br>30.0.0 30.0.1 30.0.2 30.0.3<br>29.0.0 29.0.1 29.0.2 29.0.3<br>28.0.0 28.0.1 28.0.2 28.0.3<br>27.0.0 27.0.1 27.0.2 27.0.3                                                                                |
-| Android SDK Platforms      | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1)<br>android-30 (rev 3)<br>android-29 (rev 5)<br>android-28 (rev 6)<br>android-27 (rev 3) |
-| Android SDK Platform-Tools | 34.0.5                                                                                                                                                                                                                                                        |
-| Android Support Repository | 47.0.0                                                                                                                                                                                                                                                        |
-| CMake                      | 3.18.1<br>3.22.1                                                                                                                                                                                                                                              |
-| Google Play services       | 49                                                                                                                                                                                                                                                            |
-| Google Repository          | 58                                                                                                                                                                                                                                                            |
-| NDK                        | 23.2.8568313<br>24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125                                                                                                                                                                                       |
-| SDK Patch Applier v4       | 1                                                                                                                                                                                                                                                             |
+| Package Name               | Version                                                                                                                                                                                           |
+| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Android Command Line Tools | 8.0                                                                                                                                                                                               |
+| Android Emulator           | 33.1.24                                                                                                                                                                                           |
+| Android SDK Build-tools    | 34.0.0<br>33.0.0 33.0.1 33.0.2<br>32.0.0<br>31.0.0                                                                                                                                                |
+| Android SDK Platforms      | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3)<br>android-32 (rev 1)<br>android-31 (rev 1) |
+| Android SDK Platform-Tools | 34.0.5                                                                                                                                                                                            |
+| Android Support Repository | 47.0.0                                                                                                                                                                                            |
+| CMake                      | 3.18.1<br>3.22.1                                                                                                                                                                                  |
+| Google Play services       | 49                                                                                                                                                                                                |
+| Google Repository          | 58                                                                                                                                                                                                |
+| NDK                        | 24.0.8215888<br>25.2.9519653 (default)<br>26.1.10909125                                                                                                                                           |
 
 #### Environment variables
 | Name                    | Value                                               |
@@ -359,7 +365,7 @@ mv "/Applications/Visual Studio 2019.app" "/Applications/Visual Studio.app"
 #### Environment variables
 | Name              | Value                                                                                     |
 | ----------------- | ----------------------------------------------------------------------------------------- |
-| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.1.0-54729/ParallelsDesktop-19.1.0-54729.dmg |
+| PARALLELS_DMG_URL | https://download.parallels.com/desktop/v19/19.2.1-54832/ParallelsDesktop-19.2.1-54832.dmg |
 
 ##### Notes
 ```

images/macos/macos-13-Readme.md

@@ -1,12 +1,18 @@
+| Announcements |
+|-|
+| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) |
+| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) |
+| [Major Refactoring of GitHub Actions Runner Images Repository](https://github.com/actions/runner-images/issues/8706) |
+***
 # macOS 13
-- OS Version: macOS 13.6 (22G120)
+- OS Version: macOS 13.6.3 (22G436)
 - Kernel Version: Darwin 22.6.0
-- Image Version: 20231025.2
+- Image Version: 20240106.8
 
 ## Installed Software
 
 ### Language and Runtime
-- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.403
+- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.404, 8.0.100
 - Bash 3.2.57(1)-release
 - Clang/LLVM 14.0.3
 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang`
@@ -16,87 +22,85 @@
 - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias
 - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias
 - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias
-- Julia 1.9.3
-- Kotlin 1.9.10-release-459
+- Julia 1.10.0
+- Kotlin 1.9.22-release-704
 - Mono 6.12.0.188
-- Node.js 18.18.2
-- Perl 5.38.0
-- PHP 8.2.11
-- Python3 3.12.0
-- R 4.3.1
+- Node.js 18.19.0
+- Perl 5.38.2
+- PHP 8.3.1
+- Python3 3.12.1
+- R 4.3.2
 - Ruby 3.0.6p216
 
 ### Package Management
-- Bundler 2.4.21
+- Bundler 2.5.4
 - Carthage 0.39.1
-- CocoaPods 1.13.0
-- Composer 2.6.5
-- Homebrew 4.1.17
-- NPM 9.8.1
+- CocoaPods 1.14.3
+- Composer 2.6.6
+- Homebrew 4.2.2
+- NPM 10.2.3
 - NuGet 6.3.1.1
-- Pip3 23.3.1 (python 3.12)
-- Pipx 1.2.1
-- RubyGems 3.4.21
-- Vcpkg 2023 (build from commit 213c01f87)
+- Pip3 23.3.2 (python 3.12)
+- Pipx 1.4.1
+- RubyGems 3.5.4
+- Vcpkg 2023 (build from commit ce46ba877)
 - Yarn 1.22.19
 
 ### Project Management
 - Apache Ant 1.10.14
-- Apache Maven 3.9.5
-- Gradle 8.4
+- Apache Maven 3.9.6
+- Gradle 8.5
 
 ### Utilities
 - 7-Zip 17.05
-- aria2 1.36.0
-- azcopy 10.21.1
-- bazel 6.4.0
-- bazelisk 1.18.0
+- aria2 1.37.0
+- azcopy 10.21.2
+- bazel 7.0.0
+- bazelisk 1.19.0
 - bsdtar 3.5.3 - available by 'tar' alias
-- Curl 8.4.0
-- Git 2.42.0
-- Git LFS 3.4.0
-- GitHub CLI 2.37.0
+- Curl 8.5.0
+- Git 2.43.0
+- Git LFS 3.4.1
+- GitHub CLI 2.40.1
 - GNU Tar 1.35 - available by 'gtar' alias
 - GNU Wget 1.21.4
 - gpg (GnuPG) 2.4.3
-- jq 1.7
+- jq 1.7.1
 - OpenSSL 1.1.1w  11 Sep 2023
 - Packer 1.9.4
 - pkg-config 0.29.2
-- yq 4.35.2
+- yq 4.40.5
 - zstd 1.5.5
 
 ### Tools
-- AWS CLI 2.13.29
-- AWS SAM CLI 1.99.0
-- AWS Session Manager CLI 1.2.497.0
-- Azure CLI 2.53.1
+- AWS CLI 2.15.8
+- AWS SAM CLI 1.106.0
+- AWS Session Manager CLI 1.2.536.0
+- Azure CLI 2.55.0
 - Azure CLI (azure-devops) 0.26.0
-- Bicep CLI 0.22.6
-- Cabal 3.6.2.0
-- Cmake 3.27.7
-- CodeQL Action Bundle 2.15.1
-- Fastlane 2.216.0
-- GHC 9.8.1
-- GHCup 0.1.19.4
-- Stack 2.13.1
-- SwiftFormat 0.52.8
-- Xcode Command Line Tools 15.0.0.0.1.1694021235
+- Bicep CLI 0.24.24
+- Cmake 3.28.1
+- CodeQL Action Bundle 2.15.5
+- Fastlane 2.219.0
+- SwiftFormat 0.52.11
+- Xcbeautify 1.3.0
+- Xcode Command Line Tools 15.1.0.0.1.1700200546
+- Xcodes 1.4.1
 
 ### Linters
 - SwiftLint 0.53.0
 
 ### Browsers
-- Safari 17.0 (18616.1.27.111.22)
-- SafariDriver 17.0 (18616.1.27.111.22)
-- Google Chrome 118.0.5993.117
-- Google Chrome for Testing 118.0.5993.70
-- ChromeDriver 118.0.5993.70
-- Microsoft Edge 118.0.2088.69
-- Microsoft Edge WebDriver 118.0.2088.69
-- Mozilla Firefox 119.0
-- geckodriver 0.33.0
-- Selenium server 4.14.1
+- Safari 17.2.1 (18617.1.17.11.12)
+- SafariDriver 17.2.1 (18617.1.17.11.12)
+- Google Chrome 120.0.6099.199
+- Google Chrome for Testing 120.0.6099.109
+- ChromeDriver 120.0.6099.109
+- Microsoft Edge 120.0.2210.121
+- Microsoft Edge WebDriver 120.0.2210.91
+- Mozilla Firefox 121.0
+- geckodriver 0.34.0
+- Selenium server 4.16.1
 
 #### Environment variables
 | Name            | Value                                 |
@@ -111,7 +115,7 @@
 | 8.0.392+8          | JAVA_HOME_8_X64      |
 | 11.0.21+9          | JAVA_HOME_11_X64     |
 | 17.0.9+9 (default) | JAVA_HOME_17_X64     |
-| 21.0.1+12.0.LTS    | JAVA_HOME_21_X64     |
+| 21.0.1+12.0        | JAVA_HOME_21_X64     |
 
 ### Cached Tools
 
@@ -120,58 +124,56 @@
 - 3.1.4
 
 #### PyPy
-- 2.7.18 [PyPy 7.3.13]
+- 2.7.18 [PyPy 7.3.14]
 - 3.7.13 [PyPy 7.3.9]
 - 3.8.16 [PyPy 7.3.11]
-- 3.9.18 [PyPy 7.3.13]
-- 3.10.13 [PyPy 7.3.13]
+- 3.9.18 [PyPy 7.3.14]
+- 3.10.13 [PyPy 7.3.14]
 
 #### Python
 - 3.8.18
 - 3.9.18
 - 3.10.13
-- 3.11.6
-- 3.12.0
+- 3.11.7
+- 3.12.1
 
 #### Node.js
 - 16.20.2
-- 18.18.2
-- 20.9.0
+- 18.19.0
+- 20.10.0
 
 #### Go
 - 1.19.13
-- 1.20.10
-- 1.21.3
+- 1.20.12
+- 1.21.5
 
 ### Rust Tools
-- Cargo 1.73.0
-- Rust 1.73.0
-- Rustdoc 1.73.0
+- Cargo 1.75.0
+- Rust 1.75.0
+- Rustdoc 1.75.0
 - Rustup 1.26.0
 
 #### Packages
-- Bindgen 0.68.1
-- Cargo-audit 0.18.3
-- Cargo-outdated 0.13.1
-- Cbindgen 0.26.0
-- Clippy 0.1.73
-- Rustfmt 1.6.0-stable
+- Clippy 0.1.75
+- Rustfmt 1.7.0-stable
 
 ### PowerShell Tools
-- PowerShell 7.2.15
+- PowerShell 7.2.17
 
 #### PowerShell Modules
-- Az: 10.4.1
+- Az: 11.1.0
 - Pester: 5.5.0
 - PSScriptAnalyzer: 1.21.0
 
 ### Xcode
-| Version          | Build   | Path                           |
-| ---------------- | ------- | ------------------------------ |
-| 15.0.1           | 15A507  | /Applications/Xcode_15.0.1.app |
-| 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app |
-| 14.2             | 14C18   | /Applications/Xcode_14.2.app   |
-| 14.1             | 14B47b  | /Applications/Xcode_14.1.app   |
+| Version          | Build    | Path                           |
+| ---------------- | -------- | ------------------------------ |
+| 15.2 (beta)      | 15C5500c | /Applications/Xcode_15.2.app   |
+| 15.1             | 15C65    | /Applications/Xcode_15.1.app   |
+| 15.0.1           | 15A507   | /Applications/Xcode_15.0.1.app |
+| 14.3.1 (default) | 14E300c  | /Applications/Xcode_14.3.1.app |
+| 14.2             | 14C18    | /Applications/Xcode_14.2.app   |
+| 14.1             | 14B47b   | /Applications/Xcode_14.1.app   |
 
 #### Xcode Support Tools
 - xcpretty 0.3.0
@@ -183,26 +185,35 @@
 | macOS 13.1                                              | macosx13.1                                    | 14.2          |
 | macOS 13.3                                              | macosx13.3                                    | 14.3.1        |
 | macOS 14.0                                              | macosx14.0                                    | 15.0.1        |
+| macOS 14.2                                              | macosx14.2                                    | 15.1, 15.2    |
 | iOS 16.1                                                | iphoneos16.1                                  | 14.1          |
 | iOS 16.2                                                | iphoneos16.2                                  | 14.2          |
 | iOS 16.4                                                | iphoneos16.4                                  | 14.3.1        |
 | iOS 17.0                                                | iphoneos17.0                                  | 15.0.1        |
+| iOS 17.2                                                | iphoneos17.2                                  | 15.1, 15.2    |
 | Simulator - iOS 16.1                                    | iphonesimulator16.1                           | 14.1          |
 | Simulator - iOS 16.2                                    | iphonesimulator16.2                           | 14.2          |
 | Simulator - iOS 16.4                                    | iphonesimulator16.4                           | 14.3.1        |
 | Simulator - iOS 17.0                                    | iphonesimulator17.0                           | 15.0.1        |
+| Simulator - iOS 17.2                                    | iphonesimulator17.2                           | 15.1, 15.2    |
 | tvOS 16.1                                               | appletvos16.1                                 | 14.1, 14.2    |
 | tvOS 16.4                                               | appletvos16.4                                 | 14.3.1        |
 | tvOS 17.0                                               | appletvos17.0                                 | 15.0.1        |
+| tvOS 17.2                                               | appletvos17.2                                 | 15.1, 15.2    |
 | Simulator - tvOS 16.1                                   | appletvsimulator16.1                          | 14.1, 14.2    |
 | Simulator - tvOS 16.4                                   | appletvsimulator16.4                          | 14.3.1        |
 | Simulator - tvOS 17.0                                   | appletvsimulator17.0                          | 15.0.1        |
+| Simulator - tvOS 17.2                                   | appletvsimulator17.2                          | 15.1, 15.2    |
 | watchOS 9.1                                             | watchos9.1                                    | 14.1, 14.2    |
 | watchOS 9.4                                             | watchos9.4                                    | 14.3.1        |
 | watchOS 10.0                                            | watchos10.0                                   | 15.0.1        |
+| watchOS 10.2                                            | watchos10.2                                   | 15.1, 15.2    |
 | Simulator - watchOS 9.1                                 | watchsimulator9.1                             | 14.1, 14.2    |
 | Simulator - watchOS 9.4                                 | watchsimulator9.4                             | 14.3.1        |
 | Simulator - watchOS 10.0                                | watchsimulator10.0                            | 15.0.1        |
+| Simulator - watchOS 10.2                                | watchsimulator10.2                            | 15.1, 15.2    |
+| Simulator - visionOS 1.0                                | xrsimulator1.0                                | 15.2          |
+| visionOS 1.0                                            | xros1.0                                       | 15.2          |
 | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4    | 14.3.1        |
 | Asset Runtime SDK for macOS hosts targeting tvOS 16.4   | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1        |
 | Asset Runtime SDK for macOS hosts targeting iOS 16.4    | assetruntime.host.macosx.target.iphoneos16.4  | 14.3.1        |
@@ -210,35 +221,38 @@
 | DriverKit 22.2                                          | driverkit22.2                                 | 14.2          |
 | DriverKit 22.4                                          | driverkit22.4                                 | 14.3.1        |
 | DriverKit 23.0                                          | driverkit23.0                                 | 15.0.1        |
+| DriverKit 23.2                                          | driverkit23.2                                 | 15.1, 15.2    |
 
 #### Installed Simulators
-| OS           | Xcode Version                    | Simulators                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| ------------ | -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| iOS 16.1     | 14.1                             | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
-| iOS 16.2     | 14.2                             | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
-| iOS 16.4     | 14.3.1                           | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
-| iOS 17.0     | 14.1<br>14.2<br>14.3.1<br>15.0.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                        |
-| tvOS 16.1    | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
-| tvOS 16.4    | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
-| tvOS 17.0    | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
-| watchOS 9.1  | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm)                                                                                             |
-| watchOS 9.4  | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm)                                                                                             |
-| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) |
+| OS           | Xcode Version                                    | Simulators                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| ------------ | ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| iOS 16.1     | 14.1                                             | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
+| iOS 16.2     | 14.2                                             | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
+| iOS 16.4     | 14.3.1                                           | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
+| iOS 17.0     | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                        |
+| iOS 17.2     | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                        |
+| tvOS 16.1    | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
+| tvOS 16.4    | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
+| tvOS 17.0    | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
+| tvOS 17.2    | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
+| watchOS 9.1  | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm)                                                                                             |
+| watchOS 9.4  | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm)                                                                                             |
+| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) |
+| watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) |
 
 ### Android
-| Package Name               | Version                                                                                                                   |
-| -------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
-| Android Command Line Tools | 11.0                                                                                                                      |
-| Android Emulator           | 32.1.15                                                                                                                   |
-| Android SDK Build-tools    | 34.0.0<br>33.0.2                                                                                                          |
-| Android SDK Platforms      | android-34-ext8 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) |
-| Android SDK Platform-Tools | 34.0.5                                                                                                                    |
-| Android Support Repository | 47.0.0                                                                                                                    |
-| CMake                      | 3.22.1                                                                                                                    |
-| Google Play services       | 49                                                                                                                        |
-| Google Repository          | 58                                                                                                                        |
-| NDK                        | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default)                                                                   |
-| SDK Patch Applier v4       | 1                                                                                                                         |
+| Package Name               | Version                                                                                                                                               |
+| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Android Command Line Tools | 11.0                                                                                                                                                  |
+| Android Emulator           | 33.1.24                                                                                                                                               |
+| Android SDK Build-tools    | 34.0.0<br>33.0.2                                                                                                                                      |
+| Android SDK Platforms      | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) |
+| Android SDK Platform-Tools | 34.0.5                                                                                                                                                |
+| Android Support Repository | 47.0.0                                                                                                                                                |
+| CMake                      | 3.22.1                                                                                                                                                |
+| Google Play services       | 49                                                                                                                                                    |
+| Google Repository          | 58                                                                                                                                                    |
+| NDK                        | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default)                                                                                               |
 
 #### Environment variables
 | Name                    | Value                                               |
@@ -249,3 +263,4 @@
 | ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 |
 | ANDROID_NDK_ROOT        | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 |
 | ANDROID_SDK_ROOT        | /Users/runner/Library/Android/sdk                   |
+

images/macos/macos-13-arm64-Readme.md

@@ -1,12 +1,17 @@
+| Announcements |
+|-|
+| [[All OSes] Powershell Core will be updated to 7.4.x LTS on January, 28](https://github.com/actions/runner-images/issues/9115) |
+| [Old versions of Android SDK & tools will be removed from images on January, 8](https://github.com/actions/runner-images/issues/8952) |
+***
 # macOS 13
-- OS Version: macOS 13.6 (22G120)
+- OS Version: macOS 13.6.3 (22G436)
 - Kernel Version: Darwin 22.6.0
-- Image Version: 20231024.2
+- Image Version: 20240114.1
 
 ## Installed Software
 
 ### Language and Runtime
-- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.403
+- .NET Core SDK: 7.0.102, 7.0.202, 7.0.306, 7.0.405, 8.0.101
 - Bash 3.2.57(1)-release
 - Clang/LLVM 14.0.3
 - Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang`
@@ -16,69 +21,74 @@
 - GNU Fortran 11 (Homebrew GCC 11.4.0) - available by `gfortran-11` alias
 - GNU Fortran 12 (Homebrew GCC 12.3.0) - available by `gfortran-12` alias
 - GNU Fortran 13 (Homebrew GCC 13.2.0) - available by `gfortran-13` alias
-- Julia 1.9.3
-- Kotlin 1.9.10-release-459
+- Julia 1.10.0
+- Kotlin 1.9.22-release-704
 - Mono 6.12.0.188
-- Node.js 18.18.2
-- Perl 5.38.0
-- R 4.3.1
+- Node.js 18.19.0
+- Perl 5.38.2
+- R 4.3.2
 - Ruby 3.0.6p216
 
 ### Package Management
-- Bundler 2.4.21
+- Bundler 2.5.4
 - Carthage 0.39.1
-- CocoaPods 1.13.0
-- Homebrew 4.1.17
-- NPM 9.8.1
+- CocoaPods 1.14.3
+- Homebrew 4.2.3
+- NPM 10.2.3
 - NuGet 6.3.1.1
-- RubyGems 3.4.21
+- RubyGems 3.5.4
 - Yarn 1.22.19
 
 ### Project Management
 - Apache Ant 1.10.14
-- Apache Maven 3.9.5
-- Gradle 8.4
+- Apache Maven 3.9.6
+- Gradle 8.5
 
 ### Utilities
 - 7-Zip 17.05
-- aria2 1.36.0
-- azcopy 10.21.0
-- bazel 6.4.0
-- bazelisk 1.18.0
+- aria2 1.37.0
+- azcopy 10.21.2
+- bazel 7.0.0
+- bazelisk 1.19.0
 - bsdtar 3.5.3 - available by 'tar' alias
 - Curl 8.1.2
-- Git 2.42.0
-- Git LFS 3.4.0
-- GitHub CLI 2.37.0
+- Git 2.43.0
+- Git LFS 3.4.1
+- GitHub CLI 2.42.0
 - GNU Tar 1.35 - available by 'gtar' alias
 - GNU Wget 1.21.4
 - gpg (GnuPG) 2.4.3
-- jq 1.7
+- jq 1.7.1
 - OpenSSL 1.1.1w  11 Sep 2023
 - Packer 1.9.4
 - pkg-config 0.29.2
-- yq 4.35.2
+- yq 4.40.5
 - zstd 1.5.5
 
 ### Tools
-- Azure CLI 2.53.1
+- AWS CLI 2.15.10
+- AWS SAM CLI 1.107.0
+- AWS Session Manager CLI 1.2.553.0
+- Azure CLI 2.56.0
 - Azure CLI (azure-devops) 0.26.0
-- Bicep CLI 0.22.6
-- Cmake 3.27.7
-- CodeQL Action Bundle 2.15.1
-- Fastlane 2.216.0
-- SwiftFormat 0.52.8
-- Xcode Command Line Tools 15.0.0.0.1.1694021235
+- Bicep CLI 0.24.24
+- Cmake 3.28.1
+- CodeQL Action Bundle 2.15.5
+- Fastlane 2.219.0
+- SwiftFormat 0.53.0
+- Xcbeautify 1.4.0
+- Xcode Command Line Tools 15.1.0.0.1.1700200546
+- Xcodes 1.4.1
 
 ### Linters
 
 ### Browsers
-- Safari 17.0 (18616.1.27.111.22)
-- SafariDriver 17.0 (18616.1.27.111.22)
-- Google Chrome 118.0.5993.117
-- Google Chrome for Testing 118.0.5993.70
-- ChromeDriver 118.0.5993.70
-- Selenium server 4.14.1
+- Safari 17.2.1 (18617.1.17.11.12)
+- SafariDriver 17.2.1 (18617.1.17.11.12)
+- Google Chrome 120.0.6099.216
+- Google Chrome for Testing 120.0.6099.109
+- ChromeDriver 120.0.6099.109
+- Selenium server 4.16.1
 
 #### Environment variables
 | Name            | Value                                   |
@@ -92,47 +102,47 @@
 | ------------------ | -------------------- |
 | 11.0.21+9          | JAVA_HOME_11_arm64   |
 | 17.0.9+9 (default) | JAVA_HOME_17_arm64   |
-| 21.0.1+12.0.LTS    | JAVA_HOME_21_arm64   |
+| 21.0.1+12.0        | JAVA_HOME_21_arm64   |
 
 ### Cached Tools
 
 #### Python
-- 3.11.6
-- 3.12.0
+- 3.11.7
+- 3.12.1
 
 #### Node.js
 - 16.20.1
-- 18.16.1
+- 18.19.0
+- 20.10.0
 
 #### Go
 - 1.19.13
-- 1.20.8
+- 1.20.12
+- 1.21.5
 
 ### Rust Tools
-- Cargo 1.73.0
-- Rust 1.73.0
-- Rustdoc 1.73.0
+- Cargo 1.75.0
+- Rust 1.75.0
+- Rustdoc 1.75.0
 - Rustup 1.26.0
 
 #### Packages
-- Bindgen 0.68.1
-- Cargo-audit 0.18.3
-- Cargo-outdated 0.13.1
-- Cbindgen 0.26.0
-- Clippy 0.1.73
-- Rustfmt 1.6.0-stable
+- Clippy 0.1.75
+- Rustfmt 1.7.0-stable
 
 ### PowerShell Tools
-- PowerShell 7.2.15
+- PowerShell 7.2.18
 
 #### PowerShell Modules
-- Az: 10.4.1
+- Az: 11.2.0
 - Pester: 5.5.0
 - PSScriptAnalyzer: 1.21.0
 
 ### Xcode
 | Version          | Build   | Path                           |
 | ---------------- | ------- | ------------------------------ |
+| 15.2             | 15C500b | /Applications/Xcode_15.2.app   |
+| 15.1             | 15C65   | /Applications/Xcode_15.1.app   |
 | 15.0.1           | 15A507  | /Applications/Xcode_15.0.1.app |
 | 14.3.1 (default) | 14E300c | /Applications/Xcode_14.3.1.app |
 | 14.2             | 14C18   | /Applications/Xcode_14.2.app   |
@@ -148,44 +158,83 @@
 | macOS 13.1                                              | macosx13.1                                    | 14.2          |
 | macOS 13.3                                              | macosx13.3                                    | 14.3.1        |
 | macOS 14.0                                              | macosx14.0                                    | 15.0.1        |
+| macOS 14.2                                              | macosx14.2                                    | 15.1, 15.2    |
 | iOS 16.1                                                | iphoneos16.1                                  | 14.1          |
 | iOS 16.2                                                | iphoneos16.2                                  | 14.2          |
 | iOS 16.4                                                | iphoneos16.4                                  | 14.3.1        |
 | iOS 17.0                                                | iphoneos17.0                                  | 15.0.1        |
+| iOS 17.2                                                | iphoneos17.2                                  | 15.1, 15.2    |
 | Simulator - iOS 16.1                                    | iphonesimulator16.1                           | 14.1          |
 | Simulator - iOS 16.2                                    | iphonesimulator16.2                           | 14.2          |
 | Simulator - iOS 16.4                                    | iphonesimulator16.4                           | 14.3.1        |
 | Simulator - iOS 17.0                                    | iphonesimulator17.0                           | 15.0.1        |
+| Simulator - iOS 17.2                                    | iphonesimulator17.2                           | 15.1, 15.2    |
 | tvOS 16.1                                               | appletvos16.1                                 | 14.1, 14.2    |
 | tvOS 16.4                                               | appletvos16.4                                 | 14.3.1        |
 | tvOS 17.0                                               | appletvos17.0                                 | 15.0.1        |
+| tvOS 17.2                                               | appletvos17.2                                 | 15.1, 15.2    |
 | Simulator - tvOS 16.1                                   | appletvsimulator16.1                          | 14.1, 14.2    |
 | Simulator - tvOS 16.4                                   | appletvsimulator16.4                          | 14.3.1        |
 | Simulator - tvOS 17.0                                   | appletvsimulator17.0                          | 15.0.1        |
+| Simulator - tvOS 17.2                                   | appletvsimulator17.2                          | 15.1, 15.2    |
 | watchOS 9.1                                             | watchos9.1                                    | 14.1, 14.2    |
 | watchOS 9.4                                             | watchos9.4                                    | 14.3.1        |
 | watchOS 10.0                                            | watchos10.0                                   | 15.0.1        |
+| watchOS 10.2                                            | watchos10.2                                   | 15.1, 15.2    |
 | Simulator - watchOS 9.1                                 | watchsimulator9.1                             | 14.1, 14.2    |
 | Simulator - watchOS 9.4                                 | watchsimulator9.4                             | 14.3.1        |
 | Simulator - watchOS 10.0                                | watchsimulator10.0                            | 15.0.1        |
+| Simulator - watchOS 10.2                                | watchsimulator10.2                            | 15.1, 15.2    |
+| Simulator - visionOS 1.0                                | xrsimulator1.0                                | 15.2          |
+| visionOS 1.0                                            | xros1.0                                       | 15.2          |
 | Asset Runtime SDK for macOS hosts targeting watchOS 9.4 | assetruntime.host.macosx.target.watchos9.4    | 14.3.1        |
-| Asset Runtime SDK for macOS hosts targeting tvOS 16.4   | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1        |
 | Asset Runtime SDK for macOS hosts targeting iOS 16.4    | assetruntime.host.macosx.target.iphoneos16.4  | 14.3.1        |
+| Asset Runtime SDK for macOS hosts targeting tvOS 16.4   | assetruntime.host.macosx.target.appletvos16.4 | 14.3.1        |
 | DriverKit 22.1                                          | driverkit22.1                                 | 14.1          |
 | DriverKit 22.2                                          | driverkit22.2                                 | 14.2          |
 | DriverKit 22.4                                          | driverkit22.4                                 | 14.3.1        |
 | DriverKit 23.0                                          | driverkit23.0                                 | 15.0.1        |
+| DriverKit 23.2                                          | driverkit23.2                                 | 15.1, 15.2    |
 
 #### Installed Simulators
-| OS           | Xcode Version                    | Simulators                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
-| ------------ | -------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| iOS 16.1     | 14.1                             | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
-| iOS 16.2     | 14.2                             | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
-| iOS 16.4     | 14.3.1                           | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
-| iOS 17.0     | 14.1<br>14.2<br>14.3.1<br>15.0.1 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                        |
-| tvOS 16.1    | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
-| tvOS 16.4    | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
-| tvOS 17.0    | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
-| watchOS 9.1  | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm)                                                                                             |
-| watchOS 9.4  | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm)                                                                                             |
-| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) |
+| OS           | Xcode Version                                    | Simulators                                                                                                                                                                                                                                                                                                                                                                                                                                                       |
+| ------------ | ------------------------------------------------ | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| iOS 16.1     | 14.1                                             | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
+| iOS 16.2     | 14.2                                             | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
+| iOS 16.4     | 14.3.1                                           | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                                                                                             |
+| iOS 17.0     | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                        |
+| iOS 17.2     | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | iPhone 14<br>iPhone 14 Plus<br>iPhone 14 Pro<br>iPhone 14 Pro Max<br>iPhone 15<br>iPhone 15 Plus<br>iPhone 15 Pro<br>iPhone 15 Pro Max<br>iPhone SE (3rd generation)<br>iPad (10th generation)<br>iPad Air (5th generation)<br>iPad mini (6th generation)<br>iPad Pro (11-inch) (4th generation)<br>iPad Pro (12.9-inch) (6th generation)                                                                                                                        |
+| tvOS 16.1    | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
+| tvOS 16.4    | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
+| tvOS 17.0    | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
+| tvOS 17.2    | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple TV<br>Apple TV 4K (3rd generation)<br>Apple TV 4K (3rd generation) (at 1080p)                                                                                                                                                                                                                                                                                                                                                                              |
+| watchOS 9.1  | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm)                                                                                             |
+| watchOS 9.4  | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Ultra (49mm)                                                                                             |
+| watchOS 10.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) |
+| watchOS 10.2 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Watch SE (40mm) (2nd generation)<br>Apple Watch SE (44mm) (2nd generation)<br>Apple Watch Series 5 (40mm)<br>Apple Watch Series 5 (44mm)<br>Apple Watch Series 6 (40mm)<br>Apple Watch Series 6 (44mm)<br>Apple Watch Series 7 (41mm)<br>Apple Watch Series 7 (45mm)<br>Apple Watch Series 8 (41mm)<br>Apple Watch Series 8 (45mm)<br>Apple Watch Series 9 (41mm)<br>Apple Watch Series 9 (45mm)<br>Apple Watch Ultra (49mm)<br>Apple Watch Ultra 2 (49mm) |
+| visionOS 1.0 | 14.1<br>14.2<br>14.3.1<br>15.0.1<br>15.1<br>15.2 | Apple Vision Pro                                                                                                                                                                                                                                                                                                                                                                                                                                                 |
+
+### Android
+| Package Name               | Version                                                                                                                                               |
+| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
+| Android Command Line Tools | 11.0                                                                                                                                                  |
+| Android Emulator           | 33.1.24                                                                                                                                               |
+| Android SDK Build-tools    | 34.0.0<br>33.0.2                                                                                                                                      |
+| Android SDK Platforms      | android-34-ext8 (rev 1)<br>android-34-ext10 (rev 1)<br>android-34 (rev 2)<br>android-33-ext5 (rev 1)<br>android-33-ext4 (rev 1)<br>android-33 (rev 3) |
+| Android SDK Platform-Tools | 34.0.5                                                                                                                                                |
+| Android Support Repository | 47.0.0                                                                                                                                                |
+| CMake                      | 3.22.1                                                                                                                                                |
+| Google Play services       | 49                                                                                                                                                    |
+| Google Repository          | 58                                                                                                                                                    |
+| NDK                        | 24.0.8215888<br>25.2.9519653<br>26.1.10909125 (default)                                                                                               |
+
+#### Environment variables
+| Name                    | Value                                               |
+| ----------------------- | --------------------------------------------------- |
+| ANDROID_HOME            | /Users/runner/Library/Android/sdk                   |
+| ANDROID_NDK             | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 |
+| ANDROID_NDK_HOME        | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 |
+| ANDROID_NDK_LATEST_HOME | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 |
+| ANDROID_NDK_ROOT        | /Users/runner/Library/Android/sdk/ndk/26.1.10909125 |
+| ANDROID_SDK_ROOT        | /Users/runner/Library/Android/sdk                   |
+

images/macos/scripts/build/Configure-Toolset.ps1

@@ -6,8 +6,7 @@
 
 Import-Module "~/image-generation/helpers/Common.Helpers.psm1"
 
-function Get-ToolsetToolFullPath
-{
+function Get-ToolsetToolFullPath {
     param
     (
         [Parameter(Mandatory)] [string] $ToolName,
@@ -23,25 +22,23 @@ function Get-ToolsetToolFullPath
 }
 
 $arch = Get-Architecture
-$toolcache = Get-ToolsetValue "toolcache"
+$toolcache = (Get-ToolsetContent).toolcache
 
-foreach ($tool in $toolcache)
-{
+foreach ($tool in $toolcache) {
     $toolName = $tool.name
     $toolEnvironment = $tool.arch.$arch.variable_template
 
-    if (-not $toolEnvironment)
-    {
+    if (-not $toolEnvironment) {
         continue
     }
 
-    foreach ($toolVersion in $tool.arch.$arch.versions)
-    {
+    foreach ($toolVersion in $tool.arch.$arch.versions) {
         Write-Host "Set $toolName $toolVersion environment variable..."
         $toolPath = Get-ToolsetToolFullPath -ToolName $toolName -ToolVersion $toolVersion -ToolArchitecture $arch
         $envName = $toolEnvironment -f $toolVersion.split(".")
 
         # Add environment variable name=value
-        Add-EnvironmentVariable -Name $envName -Value $toolPath
+        $envVar = "export {0}={1}" -f $envName, $toolPath
+        Add-Content -Path "${env:HOME}/.bashrc" -Value $envVar
     }
 }

images/macos/scripts/build/Install-Toolset.ps1

@@ -1,9 +1,10 @@
 ################################################################################
-##  File:  toolset.ps1
+##  File:  Install-Toolset.ps1
 ##  Team:  CI-Build
 ##  Desc:  Install toolset
 ################################################################################
-Import-Module "~/image-generation/helpers/Tests.Helpers.psm1"
+
+Import-Module "~/image-generation/tests/Helpers.psm1"
 Import-Module "~/image-generation/helpers/Common.Helpers.psm1"
 
 Function Install-Asset {
@@ -12,14 +13,12 @@ Function Install-Asset {
         [object] $ReleaseAsset
     )
 
-    $assetFolderPath = Join-Path "/tmp" "$($ReleaseAsset.filename)-temp-dir"
-    New-Item -ItemType Directory -Path $assetFolderPath | Out-Null
-    $assetArchivePath = Join-Path $assetFolderPath $ReleaseAsset.filename
-
-    Write-Host "Download $($ReleaseAsset.filename) archive to the $assetFolderPath folder..."
-    Start-DownloadWithRetry -Url $ReleaseAsset.download_url -DownloadPath $assetFolderPath
+    Write-Host "Download $($ReleaseAsset.filename) archive..."
+    $assetArchivePath = Invoke-DownloadWithRetry $ReleaseAsset.download_url
 
     Write-Host "Extract $($ReleaseAsset.filename) content..."
+    $assetFolderPath = Join-Path "/tmp" "$($ReleaseAsset.filename)-temp-dir"
+    New-Item -ItemType Directory -Path $assetFolderPath | Out-Null
     tar -xzf $assetArchivePath -C $assetFolderPath
 
     Write-Host "Invoke installation script..."
@@ -32,11 +31,11 @@ $arch = Get-Architecture
 
 # Get toolcache content from toolset
 $toolsToInstall = @("Python", "Node", "Go")
-$tools = Get-ToolsetValue "toolcache" | Where-Object {$toolsToInstall -contains $_.Name}
+$tools = (Get-ToolsetContent).toolcache | Where-Object {$toolsToInstall -contains $_.Name}
 
 foreach ($tool in $tools) {
     # Get versions manifest for current tool
-    $assets = Invoke-RestMethodWithRetry -Url $tool.url
+    $assets = Invoke-RestMethod $tool.url -MaximumRetryCount 10 -RetryIntervalSec 30
 
     # Get github release asset for each version
     foreach ($version in $tool.arch.$arch.versions) {
@@ -55,4 +54,4 @@ foreach ($tool in $tools) {
     }
 }
 
-Invoke-PesterTests "Toolcache"
+Invoke-PesterTests "Toolcache"

images/macos/scripts/build/Install-Xcode.ps1

@@ -1,12 +1,17 @@
+################################################################################
+##  File:  Install-Xcode.ps1
+##  Desc:  Install Xcode
+################################################################################
+
 $ErrorActionPreference = "Stop"
 
 Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1"
 Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" -DisableNameChecking
 
-$ARCH = Get-Architecture
-[Array]$xcodeVersions = Get-ToolsetValue "xcode.$ARCH.versions"
+$arch = Get-Architecture
+[Array]$xcodeVersions = (Get-ToolsetContent).xcode.$arch.versions
 write-host $xcodeVersions
-$defaultXcode = Get-ToolsetValue "xcode.default"
+$defaultXcode = (Get-ToolsetContent).xcode.default
 [Array]::Reverse($xcodeVersions)
 $threadCount = "5"
 
@@ -16,7 +21,7 @@ $xcodeVersions | ForEach-Object -ThrottleLimit $threadCount -Parallel {
     Import-Module "$env:HOME/image-generation/helpers/Common.Helpers.psm1"
     Import-Module "$env:HOME/image-generation/helpers/Xcode.Installer.psm1" -DisableNameChecking
 
-    Install-XcodeVersion -Version $_.version -LinkTo $_.link
+    Install-XcodeVersion -Version $_.version -LinkTo $_.link -Sha256Sum $_.sha256
     Confirm-XcodeIntegrity -Version $_.link
 }
 
@@ -39,7 +44,6 @@ $xcodeVersions | ForEach-Object {
         $xcodebuildPath = Get-XcodeToolPath -Version $_.link -ToolName 'xcodebuild'
         Invoke-ValidateCommand "sudo $xcodebuildPath -downloadPlatform $runtime" | Out-Null
     }
-
 }
 
 Invoke-XcodeRunFirstLaunch -Version $defaultXcode
@@ -56,7 +60,7 @@ $xcodeVersions | ForEach-Object {
 
 Write-Host "Rebuilding Launch Services database ..."
 $xcodeVersions | ForEach-Object {
-    Rebuild-XcodeLaunchServicesDb -Version $_.link
+    Initialize-XcodeLaunchServicesDb -Version $_.link
 }
 
 Write-Host "Setting default Xcode to $defaultXcode"

images/macos/scripts/build/Update-XcodeSimulators.ps1

@@ -1,18 +1,23 @@
+################################################################################
+##  File:  Update-XcodeSimulators.ps1
+##  Desc:  Check available Xcode simulators and create missing ones
+################################################################################
+
 $ErrorActionPreference = "Stop"
 
 Import-Module "$env:HOME/image-generation/helpers/Xcode.Helpers.psm1" -DisableNameChecking
 Import-Module "$env:HOME/image-generation/software-report/SoftwareReport.Xcode.psm1" -DisableNameChecking
 
-function Ensure-SimulatorInstalled {
+function Test-SimulatorInstalled {
     param(
         [Parameter(Mandatory)]
-        [string]$RuntimeId,
+        [string] $RuntimeId,
         [Parameter(Mandatory)]
-        [string]$DeviceId,
+        [string] $DeviceId,
         [Parameter(Mandatory)]
-        [string]$SimulatorName,
+        [string] $SimulatorName,
         [Parameter(Mandatory)]
-        [string]$XcodeVersion
+        [string] $XcodeVersion
     )
 
     $simctlPath = Get-XcodeToolPath -Version $XcodeVersion -ToolName "simctl"
@@ -47,5 +52,5 @@ Get-XcodeInfoList | Out-Null
 
 Write-Host "Validating and fixing Xcode simulators..."
 Get-BrokenXcodeSimulatorsList | ForEach-Object {
-    Ensure-SimulatorInstalled -RuntimeId $_.RuntimeId -DeviceId $_.DeviceId -SimulatorName $_.SimulatorName -XcodeVersion $_.XcodeVersion
-}
+    Test-SimulatorInstalled -RuntimeId $_.RuntimeId -DeviceId $_.DeviceId -SimulatorName $_.SimulatorName -XcodeVersion $_.XcodeVersion
+}

images/macos/scripts/build/apache.sh

@@ -1,8 +0,0 @@
-#!/bin/bash -e -o pipefail
-
-source ~/utils/utils.sh
-
-brew_smart_install httpd
-sudo sed -Ei '' 's/Listen .*/Listen 80/' $(brew --prefix)/etc/httpd/httpd.conf
-
-invoke_tests "WebServers" "Apache"

images/macos/scripts/build/aws.sh

@@ -1,16 +0,0 @@
-#!/bin/bash -e -o pipefail
-source ~/utils/utils.sh
-
-echo Installing aws...
-AWS_CLI_URL="https://awscli.amazonaws.com/AWSCLIV2.pkg"
-download_with_retries $AWS_CLI_URL "/tmp"
-sudo installer -pkg /tmp/AWSCLIV2.pkg -target /
-
-echo Installing aws sam cli...
-brew tap aws/tap
-brew_smart_install aws-sam-cli
-
-echo "Install aws cli session manager"
-brew install --cask session-manager-plugin
-
-invoke_tests "Common" "AWS"

images/macos/scripts/build/azcopy.sh

@@ -1,21 +0,0 @@
-#!/bin/bash -e -o pipefail
-source ~/utils/utils.sh
-arch=$(get_arch)
-
-# Check MacOS architecture and if ARM install using brew
-if [ $arch == "arm64" ]; then
-    brew_smart_install azcopy
-else
-    AZCOPY_DOWNLOAD_URL="https://aka.ms/downloadazcopy-v10-mac"
-
-    download_with_retries $AZCOPY_DOWNLOAD_URL "/tmp" "azcopy.zip"
-    unzip /tmp/azcopy.zip -d azcopy
-    AZCOPY_EXTRACTED=$(echo azcopy/azcopy*)
-    cp "$AZCOPY_EXTRACTED/azcopy" "/usr/local/bin/azcopy"
-    chmod +x "/usr/local/bin/azcopy"
-
-    echo "Done, cleaning up"
-    rm -rf azcopy*
-fi
-
-invoke_tests "Common" "AzCopy"

images/macos/scripts/build/bicep.sh

@@ -1,9 +0,0 @@
-#!/bin/bash -e -o pipefail
-
-source ~/utils/utils.sh
-
-echo Installing bicep cli...
-brew tap azure/bicep
-brew_smart_install bicep
-
-invoke_tests "Common" "Bicep"

images/macos/scripts/build/build-xcode-symlinks.sh

@@ -1,20 +0,0 @@
-#!/bin/bash -e -o pipefail
-
-source ~/utils/utils.sh
-
-# Link the existing Xcodes into the correct location for provisionator.
-
-# These symlinks are necessary for Xamarin team to make sure that xamarin-provisionator can find them.
-
-# Old style provisionator directories. This is maintained for
-# backwards compatibility only. Do not add new xcodes here.
-ln -sf /Applications/Xcode_8.app /Applications/Xcode8.app
-ln -sf /Applications/Xcode_8.1.app /Applications/Xcode81.app
-ln -sf /Applications/Xcode_9.app /Applications/Xcode9.app
-ln -sf /Applications/Xcode_9.1.app /Applications/Xcode91.app
-ln -sf /Applications/Xcode_9.2.app /Applications/Xcode92.app
-ln -sf /Applications/Xcode_9.3.app /Applications/Xcode93.app
-ln -sf /Applications/Xcode_9.3.app /Applications/Xcode_9.3_beta.app
-ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4-beta.app
-ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4_beta.app
-ln -sf /Applications/Xcode_9.4.app /Applications/Xcode_9.4_beta_2.app

images/macos/scripts/build/chrome.sh

@@ -1,50 +0,0 @@
-#!/bin/bash -e -o pipefail
-source ~/utils/utils.sh
-arch=$(get_arch)
-
-echo "Installing Google Chrome..."
-brew install --cask google-chrome
-
-# Parse Google Chrome version
-FULL_CHROME_VERSION=$("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version)
-FULL_CHROME_VERSION=${FULL_CHROME_VERSION#Google Chrome }
-CHROME_VERSION=${FULL_CHROME_VERSION%.*}
-echo "Google Chrome version is $FULL_CHROME_VERSION"
-
-# Get Google Chrome versions information
-CHROME_PLATFORM="mac-$arch"
-CHROME_VERSIONS_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json"
-download_with_retries "$CHROME_VERSIONS_URL" "/tmp" "latest-patch-versions-per-build-with-downloads.json"
-CHROME_VERSIONS_JSON=$(cat /tmp/latest-patch-versions-per-build-with-downloads.json)
-
-# Download and unpack the latest release of Chrome Driver
-CHROMEDRIVER_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version')
-echo "Installing Chrome Driver version $CHROMEDRIVER_VERSION"
-
-CHROMEDRIVER_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chromedriver[] | select(.platform=="'"${CHROME_PLATFORM}"'").url')
-CHROMEDRIVER_ARCHIVE="chromedriver-${CHROME_PLATFORM}.zip"
-CHROMEDRIVER_DIR="/usr/local/share/chromedriver-${CHROME_PLATFORM}"
-CHROMEDRIVER_BIN="$CHROMEDRIVER_DIR/chromedriver"
-
-download_with_retries "$CHROMEDRIVER_URL" "/tmp" "$CHROMEDRIVER_ARCHIVE"
-unzip -qq /tmp/$CHROMEDRIVER_ARCHIVE -d /tmp/
-sudo mv "/tmp/chromedriver-${CHROME_PLATFORM}" "$CHROMEDRIVER_DIR"
-ln -s "$CHROMEDRIVER_BIN" /usr/local/bin/chromedriver
-echo "export CHROMEWEBDRIVER=$CHROMEDRIVER_DIR" >> "${HOME}/.bashrc"
-
-# Download and unpack the latest release of Google Chrome for Testing
-CHROME_FOR_TESTING_VERSION=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].version')
-echo "Installing Google Chrome for Testing version $CHROME_FOR_TESTING_VERSION"
-
-CHROME_FOR_TESTING_URL=$(echo "${CHROME_VERSIONS_JSON}" | jq -r '.builds["'"$CHROME_VERSION"'"].downloads.chrome[] | select(.platform=="'"${CHROME_PLATFORM}"'").url')
-CHROME_FOR_TESTING_ARCHIVE="chrome-${CHROME_PLATFORM}.zip"
-CHROME_FOR_TESTING_APP="Google Chrome for Testing.app"
-
-download_with_retries $CHROME_FOR_TESTING_URL "/tmp" $CHROME_FOR_TESTING_ARCHIVE
-unzip -qq /tmp/$CHROME_FOR_TESTING_ARCHIVE -d /tmp/
-mv "/tmp/chrome-${CHROME_PLATFORM}/${CHROME_FOR_TESTING_APP}" "/Applications/${CHROME_FOR_TESTING_APP}"
-
-echo "Installing Selenium"
-brew_smart_install "selenium-server"
-
-invoke_tests "Browsers" "Chrome"

images/macos/scripts/build/cleanup-brew.sh

@@ -1,7 +0,0 @@
-#!/bin/bash -e -o pipefail
-###########################################################################
-# The script removes local Homebrew cache
-#
-###########################################################################
-
-rm -rf "$(brew --cache)"

images/macos/scripts/build/codeql-bundle.sh

@@ -1,28 +0,0 @@
-#!/bin/bash -e -o pipefail
-source ~/utils/utils.sh
-
-# Retrieve the CLI version of the latest CodeQL bundle.
-download_with_retries https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json "/tmp" "codeql-defaults.json"
-bundle_version="$(jq -r '.cliVersion' /tmp/codeql-defaults.json)"
-bundle_tag_name="codeql-bundle-v$bundle_version"
-
-echo "Downloading CodeQL bundle $bundle_version..."
-# Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run
-# different operating systems within containers.
-download_with_retries "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz" "/tmp" "codeql-bundle.tar.gz"
-codeql_archive="/tmp/codeql-bundle.tar.gz"
-
-codeql_toolcache_path="$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64"
-mkdir -p "$codeql_toolcache_path"
-
-echo "Unpacking the downloaded CodeQL bundle archive..."
-tar -xzf "$codeql_archive" -C "$codeql_toolcache_path"
-
-# Touch a file to indicate to the CodeQL Action that this bundle shipped with the toolcache. This is
-# to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise.
-touch "$codeql_toolcache_path/pinned-version"
-
-# Touch a file to indicate to the toolcache that setting up CodeQL is complete.
-touch "$codeql_toolcache_path.complete"
-
-invoke_tests "Common" "CodeQL Bundle"

images/macos/scripts/build/configure-auto-updates.sh

@@ -1,8 +1,11 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-auto-updates.sh
+##  Desc:  Disabling automatic updates
+################################################################################
 
-# Disabling automatic updates
 sudo softwareupdate --schedule off
 defaults write com.apple.SoftwareUpdate AutomaticDownload -int 0
 defaults write com.apple.SoftwareUpdate CriticalUpdateInstall -int 0
 defaults write com.apple.commerce AutoUpdate -bool false
-defaults write com.apple.SoftwareUpdate AutomaticCheckEnabled -bool false
+defaults write com.apple.SoftwareUpdate AutomaticCheckEnabled -bool false

images/macos/scripts/build/configure-autologin.sh

@@ -1,12 +1,13 @@
 #!/bin/bash -e -o pipefail
-
-# This script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/autologin.sh
-# Distributed by MIT license, license can be found at the bottom of this script
+################################################################################
+##  File:       configure-autologin.sh
+##  Desc:       add a Daemon to re-detect the attached network interfaces after vm is booted.
+##  Maintainer: @timsutton
+##              script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/autologin.sh
+################################################################################
 
 echo "Enabling automatic GUI login for the '$USERNAME' user.."
-
 python3 $HOME/bootstrap/kcpassword.py "$PASSWORD"
-
 /usr/bin/defaults write /Library/Preferences/com.apple.loginwindow autoLoginUser "$USERNAME"
 
 : '
@@ -15,4 +16,4 @@ Copyright (c) 2013-2017 Timothy Sutton
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-'
+'

images/macos/scripts/build/configure-hostname.sh

@@ -1,6 +1,10 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-hostname.sh
+##  Desc:  Change the hostname at startup to prevent duplicates
+##         Hostname and Computername should contain .local in name to avoid name resolution issues
+################################################################################
 
-# Add script for changing hostname to run on startup to prevent duplicate hostnames across the environment. Hostname and Computername should contain .local in name to avoid name resolution issues
 tee -a /usr/local/bin/change_hostname.sh > /dev/null <<\EOF
 #!/bin/bash -e -o pipefail
 
@@ -10,7 +14,7 @@ scutil --set LocalHostName $name
 scutil --set ComputerName "${name}.local"
 EOF
 
-chmod +x "/usr/local/bin/change_hostname.sh"
+chmod +x /usr/local/bin/change_hostname.sh
 
 sudo tee -a /Library/LaunchDaemons/change_hostname.plist > /dev/null <<\EOF
 <?xml version="1.0" encoding="UTF-8"?>
@@ -25,4 +29,4 @@ sudo tee -a /Library/LaunchDaemons/change_hostname.plist > /dev/null <<\EOF
                 <true/>
         </dict>
 </plist>
-EOF
+EOF

images/macos/scripts/build/configure-machine.sh

@@ -1,4 +1,8 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-machine.sh
+##  Desc:  Configure guest OS settings
+################################################################################
 
 source ~/utils/utils.sh
 
@@ -18,7 +22,7 @@ if is_Veertu; then
 fi
 
 # Change screen resolution to the maximum supported for 4Mb video memory
-if [ -d "/Library/Application Support/VMware Tools" ]; then
+if [[ -d "/Library/Application Support/VMware Tools" ]]; then
     sudo "/Library/Application Support/VMware Tools/vmware-resolutionSet" 1176 885
 fi
 
@@ -39,7 +43,6 @@ defaults write com.apple.VoiceOver4/default SCREnableAppleScript -bool YES
 
 swiftc -suppress-warnings "${HOME}/image-generation/add-certificate.swift"
 
-
 certs=(
     AppleWWDRCAG3.cer
     DeveloperIDG2CA.cer
@@ -48,9 +51,7 @@ for cert in ${certs[@]}; do
     echo "Adding ${cert} certificate"
     cert_path="${HOME}/${cert}"
     curl -fsSL "https://www.apple.com/certificateauthority/${cert}" --output ${cert_path}
-
     sudo ./add-certificate ${cert_path}
-
     rm ${cert_path}
 done
 
@@ -59,7 +60,7 @@ rm -f ./add-certificate
 # enable-automationmode-without-authentication
 if ! is_BigSur; then
 retry=10
-while [ $retry -gt 0 ]; do
+while [[ $retry -gt 0 ]]; do
 {
 osascript <<EOF
     tell application "Terminal"
@@ -76,7 +77,7 @@ EOF
 } && break
 
     retry=$((retry-1))
-    if [ $retry -eq 0 ]; then
+    if [[ $retry -eq 0 ]]; then
         echo "No retry attempts left"
         exit 1
     fi
@@ -96,7 +97,7 @@ done
 fi
 
 # Create symlink for tests running
-if [ ! -d "/usr/local/bin" ];then
+if [[ ! -d "/usr/local/bin" ]];then
     sudo mkdir -p -m 775 /usr/local/bin
     sudo chown $USER:admin /usr/local/bin
 fi

images/macos/scripts/build/configure-max-files-limitation.sh

@@ -1,10 +1,14 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-max-files-limitation.sh
+##  Desc:  Configure max files limitation
+################################################################################
 
 Launch_Daemons="/Library/LaunchDaemons"
 
 # EOF in quotes to disable variable expansion
 echo "Creating limit.maxfiles.plist"
-cat > "${Launch_Daemons}/limit.maxfiles.plist" << EOF
+cat > ${Launch_Daemons}/limit.maxfiles.plist << EOF
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
         "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
@@ -24,19 +28,17 @@ EOF
 
 # Creating script for applying workaround https://developer.apple.com/forums/thread/735798
 
-cat > "/Users/runner/limit-maxfiles.sh" << EOF
+cat > /Users/runner/limit-maxfiles.sh << EOF
 #!/bin/bash
 sudo launchctl limit maxfiles 256 unlimited
 sudo launchctl limit maxfiles 65536 524288
 EOF
 
 echo "limit.maxfiles.sh permissions changing"
-chmod +x "/Users/runner/limit-maxfiles.sh"
+chmod +x /Users/runner/limit-maxfiles.sh
 
 echo "limit.maxfiles.plist permissions changing"
 chown root:wheel "${Launch_Daemons}/limit.maxfiles.plist"
-chmod 0644 "${Launch_Daemons}/limit.maxfiles.plist"
-
+chmod 0644 ${Launch_Daemons}/limit.maxfiles.plist
 
 echo "Done, limit.maxfiles has been updated"
-

images/macos/scripts/build/configure-network-interface-detection.sh

@@ -1,13 +1,13 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:       configure-network-interface-detection.sh
+##  Desc:       add a Daemon to re-detect the attached network interfaces after vm is booted.
+##  Maintainer: @timsutton
+##              script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/add-network-interface-detection.sh
+################################################################################
 
-# This script was taken from https://github.com/timsutton/osx-vm-templates/blob/master/scripts/add-network-interface-detection.sh
-# Distributed by MIT license, license can be found at the bottom of this script
-
-# This script adds a Mac OS Launch Daemon, which runs every time the
-# machine is booted. The daemon will re-detect the attached network
-# interfaces. If this is not done, network devices may not work.
 PLIST=/Library/LaunchDaemons/sonoma.detectnewhardware.plist
-cat <<EOF > "${PLIST}"
+cat <<EOF > ${PLIST}
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -27,9 +27,8 @@ EOF
 
 # These should be already set as follows, but since they're required
 # in order to load properly, we set them explicitly.
-/bin/chmod 644 "${PLIST}"
-/usr/sbin/chown root:wheel "${PLIST}"
-
+/bin/chmod 644 ${PLIST}
+/usr/sbin/chown root:wheel ${PLIST}
 
 : '
 The MIT License (MIT)
@@ -37,4 +36,4 @@ Copyright (c) 2013-2017 Timothy Sutton
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-'
+'

images/macos/scripts/build/configure-ntpconf.sh

@@ -1,4 +1,8 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-ntpconf.sh
+##  Desc:  Configure NTP servers and set the timezone to UTC
+################################################################################
 
 echo Additional NTP servers adding into /etc/ntp.conf file...
 cat > /etc/ntp.conf << EOF
@@ -11,5 +15,5 @@ server time.windows.com
 EOF
 
 # Set the timezone to UTC.
-echo The Timezone setting to UTC...
+echo "The Timezone setting to UTC..."
 ln -sf /usr/share/zoneinfo/UTC /etc/localtime

images/macos/scripts/build/configure-preimagedata.sh

@@ -1,4 +1,8 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-preimagedata.sh
+##  Desc:  Configure data used in the image
+################################################################################
 
 source ~/utils/utils.sh
 

images/macos/scripts/build/configure-screensaver.sh

@@ -1,7 +1,11 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-screensaver.sh
+##  Desc:  Configure screensaver
+################################################################################
 
 # set screensaver idleTime to 0, to prevent turning screensaver on
-macUUID=`ioreg -rd1 -c IOPlatformExpertDevice | grep -i "UUID" | cut -c27-62`
+macUUID=$(ioreg -rd1 -c IOPlatformExpertDevice | grep -i "UUID" | cut -c27-62)
 
 rm -rf /Users/$USERNAME/Library/Preferences/com.apple.screensaver.$macUUID.plist
 rm -rf /Users/$USERNAME/Library/Preferences/ByHost/com.apple.screensaver.$macUUID.plist

images/macos/scripts/build/configure-shell.sh

@@ -1,4 +1,8 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-shell.sh
+##  Desc:  Configure shell to use bash
+################################################################################
 
 source ~/utils/utils.sh
 arch=$(get_arch)
@@ -11,4 +15,4 @@ sudo chsh -s /bin/bash root
 if [[ $arch == "arm64" ]]; then
   echo "Adding Homebrew environment to bash"
   /opt/homebrew/bin/brew shellenv >> ~/.bashrc
-fi
+fi

images/macos/scripts/build/configure-ssh.sh

@@ -1,4 +1,8 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-ssh.sh
+##  Desc:  Configure ssh
+################################################################################
 
 [[ ! -d ~/.ssh ]] && mkdir ~/.ssh 2>/dev/null
 chmod 777 ~/.ssh

images/macos/scripts/build/configure-system.sh

@@ -1,4 +1,8 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-system.sh
+##  Desc:  Post deployment system configuration actions
+################################################################################
 
 source ~/utils/utils.sh
 

images/macos/scripts/build/configure-tccdb-macos.sh

@@ -1,6 +1,8 @@
 #!/bin/bash -e -o pipefail
-
-# This script adds permissions, which are required for some installed tools to work properly, to the TCC.db
+################################################################################
+##  File:  configure-tccdb-macos.sh
+##  Desc:  Configure permissions to the TCC.db
+################################################################################
 
 source ~/utils/utils.sh
 
@@ -20,7 +22,7 @@ systemValuesArray=(
     "'kTCCServiceScreenCapture','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1599831148"
     "'kTCCServiceScreenCapture','com.devexpress.testcafe-browser-tools',0,2,3,1,X'fade0c0000000068000000010000000700000007000000080000001443fa4ca5141baeda21aeca1f50894673b440d4690000000800000014f8afcf6e69791b283e55bd0b03e39e422745770e0000000800000014bf4fc1aed64c871a49fc6bc9dd3878ce5d4d17c6',NULL,0,'UNUSED',NULL,0,1687952810"
     "'kTCCServicePostEvent','/Library/Application Support/Veertu/Anka/addons/ankarund',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1644565949"
-    "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',0,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159"
+    "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159"
     "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552"
     "'kTCCServiceAccessibility','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,NULL,1592919552"
     # Allow Full Disk Access for "Microsoft Defender for macOS" to bypass installation on-flight
@@ -60,7 +62,7 @@ userValuesArray=(
     "'kTCCServiceAppleEvents','/usr/libexec/sshd-keygen-wrapper',1,2,3,1,X'fade0c000000003c0000000100000006000000020000001d636f6d2e6170706c652e737368642d6b657967656e2d7772617070657200000000000003',NULL,0,'com.apple.Terminal',X'fade0c000000003000000001000000060000000200000012636f6d2e6170706c652e5465726d696e616c000000000003',NULL,1650386089"
     "'kTCCServicePostEvent','/bin/bash',1,2,0,1,NULL,NULL,NULL,'UNUSED',NULL,0,1583997993"
     "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.finder',X'fade0c000000002c00000001000000060000000200000010636f6d2e6170706c652e66696e64657200000003',NULL,1592919552"
-    "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',0,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159"
+    "'kTCCServiceScreenCapture','/usr/local/opt/runner/provisioner/provisioner',1,2,4,1,NULL,NULL,0,'UNUSED',NULL,0,1687786159"
     "'kTCCServiceAppleEvents','/usr/local/opt/runner/provisioner/provisioner',1,2,3,1,NULL,NULL,0,'com.apple.systemevents',X'fade0c000000003400000001000000060000000200000016636f6d2e6170706c652e73797374656d6576656e7473000000000003',NULL,1592919552"
 )
 for values in "${userValuesArray[@]}"; do

images/macos/scripts/build/configure-windows.sh

@@ -1,4 +1,8 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-windows.sh
+##  Desc:  Close open windows
+################################################################################
 
 source ~/utils/utils.sh
 
@@ -9,23 +13,22 @@ if is_Arm64; then
 fi
 
 retry=10
-while [ $retry -gt 0 ]; do
+while [[ $retry -gt 0 ]]; do
     openwindows=$(osascript -e 'tell application "System Events" to get every window of (every process whose class of windows contains window)') && break
-
     retry=$((retry-1))
-    if [ $retry -eq 0 ]; then
+    if [[ $retry -eq 0 ]]; then
         echo "No retry attempts left"
         exit 1
     fi
     sleep 30
 done
-IFS=',' read -r -a windowslist <<< "$openwindows"
+IFS=',' read -r -a windowslist <<< $openwindows
 
-if [ -n "${openwindows}" ]; then
+if [[ -n ${openwindows} ]]; then
     echo "Found opened window:"
 fi
 
-for window in "${windowslist[@]}"; do
+for window in ${windowslist[@]}; do
     if [[ $window =~ "NotificationCenter" ]]; then
         echo "[Warning] $window"
     else
@@ -34,6 +37,6 @@ for window in "${windowslist[@]}"; do
     fi
 done
 
-if [ "${scripterror}" = true ]; then
+if [[ ${scripterror} = true ]]; then
     exit 1
 fi

images/macos/scripts/build/configure-xcode-simulators.rb

@@ -1,51 +1,40 @@
 #!/usr/bin/env ruby
-
-# What is this for?
-# This script fixes an issue appeared for some Xcode users where it would show long identifiers
-# in the list of simulators instead of usual short names. This is caused by duplicate simulators
-# being sometimes created after switching between Xcode versions, with the same
-# device type + runtime pair occurring more than once in your list of available simulators.
-# Instead of showing the same simulator name twice, Xcode defaults to simulator identifiers.
-#
-# What it does?
-# The script queries Xcode's `simctl` utility for all simulators you have, finds duplicate type + runtime pairs,
-# and offers you to delete them. After that, Xcode should return to displaying the list of simulators normally.
-# When searching for duplicates, the script sorts simulators by their creation time to make sure it deletes
-# the copy that was created more recently.
-#
-# License
-# This script was taken from https://gist.github.com/vlas-voloshin/f9982128200345cd3fb7 and some modifications made
-# Distributed by MIT license, license can be found at the bottom of this script
+################################################################################
+##  File:  configure-xcode-simulators.rb
+##  Desc:  List all simulators, find duplicate type and delete them.
+##  Maintainer: @vlas-voloshin
+##              script was taken from https://gist.github.com/vlas-voloshin/f9982128200345cd3fb7
+################################################################################
 
 class SimDevice
-  
+
     attr_accessor :runtime
     attr_accessor :name
     attr_accessor :identifier
     attr_accessor :timestamp
-    
+
     def initialize(runtime, name, identifier, timestamp)
       @runtime = runtime
       @name = name
       @identifier = identifier
       @timestamp = timestamp
     end
-    
+
     def to_s
       return "#{@name} - #{@runtime} (#{@identifier}) [#{@timestamp}]"
     end
-    
+
     def equivalent_to_device(device)
       return @runtime == device.runtime && @name == device.name
     end
-    
+
   end
-  
+
   # Executes a shell command and returns the result from stdout
   def execute_simctl_command(command)
     return %x[xcrun simctl #{command}]
   end
-  
+
   # Retrieves the creation date/time of simulator with specified identifier
   def simulator_creation_date(identifier)
     directory = Dir.home() + "/Library/Developer/CoreSimulator/Devices/" + identifier
@@ -60,14 +49,14 @@ class SimDevice
       return Time.now
     end
   end
-  
+
   # Deletes specified simulator
   def delete_device(device)
     execute_simctl_command("delete #{device.identifier}")
   end
-  
+
   puts("Searching for simulators...")
-  
+
   # Retrieve the list of existing simulators
   devices = []
   runtime = ""
@@ -87,10 +76,10 @@ class SimDevice
       devices.push(device)
     end
   end
-  
+
   # Sort the simulators by their creation timestamp, ascending
   devices = devices.sort { |a, b| a.timestamp <=> b.timestamp }
-  
+
   duplicates = {}
   # Enumerate all devices except for the last one
   for i in 0..devices.count-2
@@ -106,12 +95,12 @@ class SimDevice
       end
     end
   end
-  
+
   if duplicates.count == 0
     puts("You don't have duplicate simulators!")
     exit()
   end
-  
+
   puts("Looks like you have #{duplicates.count} duplicate simulator#{duplicates.count > 1 ? "s" : ""}:")
   duplicates.each_pair do |duplicate, original|
     puts
@@ -120,14 +109,14 @@ class SimDevice
     puts("#{original}")
   end
   puts
-  
+
   puts("Each duplicate was determined as the one created later than the 'original'.")
-  
+
   puts("Deleting...")
   duplicates.each_key do |duplicate|
     delete_device(duplicate)
   end
-  
+
   puts("Done!")
 
 =begin
@@ -152,4 +141,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-=end
+=end

images/macos/scripts/build/configure-xcode.sh

@@ -1,6 +1,11 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  configure-xcode.sh
+##  Desc:  Configure Xcode after installation
+################################################################################
 
 source ~/utils/utils.sh
+
 XCODE_LIST=($(get_toolset_value '.xcode.versions | reverse | .[].link'))
 DEFAULT_XCODE_VERSION=$(get_toolset_value '.xcode.default')
 
@@ -8,15 +13,14 @@ DEFAULT_XCODE_VERSION=$(get_toolset_value '.xcode.default')
 # Assets.xcassets : error : CoreData: error: (6922) I/O error for database
 # at $HOME/Library/Developer/Xcode/UserData/IB Support/Simulator Devices/{GUID}
 echo "Erase a device's contents and settings:"
-for XCODE_VERSION in "${XCODE_LIST[@]}"
-do
+for XCODE_VERSION in ${XCODE_LIST[@]}; do
     echo "    Xcode Version: ${XCODE_VERSION}"
     launchctl remove com.apple.CoreSimulator.CoreSimulatorService || true
     #add sleep to let CoreSimulatorService to exit
     sleep 3
 
     # Select xcode version by default
-    sudo xcode-select -s "/Applications/Xcode_${XCODE_VERSION}.app/Contents/Developer"
+    sudo xcode-select -s /Applications/Xcode_${XCODE_VERSION}.app/Contents/Developer
 
     # Erase a device's contents and settings
     xcrun simctl erase all
@@ -27,4 +31,4 @@ done
 
 # Select xcode version by default
 echo "Setting Xcode ${DEFAULT_XCODE_VERSION} as default"
-sudo xcode-select -s "/Applications/Xcode_${DEFAULT_XCODE_VERSION}.app/Contents/Developer"
+sudo xcode-select -s /Applications/Xcode_${DEFAULT_XCODE_VERSION}.app/Contents/Developer

images/macos/scripts/build/dotnet.sh

@@ -1,61 +0,0 @@
-#!/bin/bash -e -o pipefail
-
-###########################################################################
-# The main idea of this script is to automate dotnet installs
-# Based on:
-# https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-install-script
-#
-###########################################################################
-source ~/utils/utils.sh
-
-export DOTNET_CLI_TELEMETRY_OPTOUT=1
-
-arch=$(get_arch)
-
-# Download installer from dot.net and keep it locally
-DOTNET_INSTALL_SCRIPT="https://dot.net/v1/dotnet-install.sh"
-download_with_retries $DOTNET_INSTALL_SCRIPT .
-chmod +x ./dotnet-install.sh
-
-ARGS_LIST=()
-echo "Parsing dotnet SDK (except rc and preview versions) from .json..."
-
-DOTNET_VERSIONS=($(get_toolset_value ".dotnet.arch[\"$arch\"].versions | .[]"))
-
-for DOTNET_VERSION in "${DOTNET_VERSIONS[@]}"; do
-    RELEASE_URL="https://raw.githubusercontent.com/dotnet/core/main/release-notes/${DOTNET_VERSION}/releases.json"
-    download_with_retries "$RELEASE_URL" "/tmp" "dotnet_${DOTNET_VERSION}.json"
-
-    if [[ $DOTNET_VERSION == "6.0" ]]; then
-        ARGS_LIST+=(
-            $(cat /tmp/dotnet_${DOTNET_VERSION}.json | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))')
-        )
-    else
-        ARGS_LIST+=(
-            $(cat /tmp/dotnet_${DOTNET_VERSION}.json | \
-            jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \
-            sort -r | rev | uniq -s 2 | rev)
-        )
-    fi
-done
-
-for ARGS in "${ARGS_LIST[@]}"; do
-    ./dotnet-install.sh --version $ARGS -NoPath --arch $arch
-done
-
-rm ./dotnet-install.sh
-
-# dotnet installer doesn't create symlink to executable in /user/local/bin
-# Moreover at that moment /user/local/bin doesn't exist (though already added to $PATH)
-ln -s ~/.dotnet/dotnet /usr/local/bin/dotnet
-
-# Validate installation
-if [ $(dotnet --list-sdks | wc -l) -lt "1" ]; then
-    echo "The .NET Core SDK is not installed"
-    exit 1
-fi
-
-echo 'export PATH="$PATH:$HOME/.dotnet/tools"' >> "$HOME/.bashrc"
-echo "Dotnet operations have been completed successfully..."
-
-invoke_tests "Common" ".NET"

images/macos/scripts/build/golang.sh

@@ -1,11 +0,0 @@
-#!/bin/bash -e -o pipefail
-source ~/utils/utils.sh
-
-DEFAULT_GO_VERSION=$(get_toolset_value '.go.default')
-echo "Installing Go..."
-brew_smart_install "go@${DEFAULT_GO_VERSION}"
-
-# Create symlinks to preserve backward compatibility. Symlinks are not created when non-latest go is being installed
-ln -sf $(brew --prefix go@${DEFAULT_GO_VERSION})/bin/* /usr/local/bin/
-
-invoke_tests "Common" "Go"

images/macos/scripts/build/install-actions-cache.sh

@@ -1,22 +1,20 @@
 #!/bin/bash -e -o pipefail
-
 ################################################################################
-##  File:       action-archive-cache.sh
-##  Desc:       Download latest release from https://github.com/actions/action-verions
-##              and un-tar to $HOME/actionarchivecache
+##  File:       install-actions-cache.sh
+##  Desc:       Download latest release from https://github.com/actions/action-versions
 ##  Maintainer: #actions-runtime and @TingluoHuang
 ################################################################################
 
 source ~/utils/utils.sh
 
 echo "Check if ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE folder exist..."
-if [ ! -d $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE ]; then
+if [[ ! -d $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE ]]; then
     mkdir -p $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE
 fi
 
-downloadUrl=$(get_github_package_download_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest")
-echo "Downloading action-versions $downloadUrl"
-download_with_retries "$downloadUrl" "/tmp" action-versions.tar.gz
-tar -xzf /tmp/action-versions.tar.gz -C $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE
+download_url=$(resolve_github_release_asset_url "actions/action-versions" "contains(\"action-versions.tar.gz\")" "latest")
+echo "Downloading action-versions $download_url"
+archive_path=$(download_with_retry $download_url)
+tar -xzf $archive_path -C $ACTIONS_RUNNER_ACTION_ARCHIVE_CACHE
 
 invoke_tests "ActionArchiveCache"

images/macos/scripts/build/install-android-sdk.sh

@@ -1,56 +1,58 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-android-sdk.sh
+##  Desc:  Install Android SDK, NDK and tools
+################################################################################
+
 source ~/utils/utils.sh
 
-function filter_components_by_version {
-    minimumVersion=$1
+add_filtered_instalaltion_components() {
+    local minimum_version=$1
     shift
-    toolsArr=("$@")
+    local tools_array=("$@")
 
-    for item in ${toolsArr[@]}
-    do
+    for item in ${tools_array[@]}; do
         # take the last argument after spliting string by ';'' and '-''
         version=$(echo "${item##*[-;]}")
-        if verlte $minimumVersion $version
-        then
+        if [[ "$(printf "${minimum_version}\n${version}\n" | sort -V | head -n1)" == "$minimum_version" ]]; then
             components+=($item)
         fi
     done
 }
 
-function get_full_ndk_version {
-    majorVersion=$1
-    ndkVersion=$(${SDKMANAGER} --list | grep "ndk;${majorVersion}.*" | awk '{gsub("ndk;", ""); print $1}' | sort -V | tail -n1)
+get_full_ndk_version() {
+    local majorVersion=$1
 
+    ndkVersion=$(${SDKMANAGER} --list | grep "ndk;${majorVersion}.*" | awk '{gsub("ndk;", ""); print $1}' | sort -V | tail -n1)
     echo "$ndkVersion"
 }
 
 components=()
 
-ANDROID_PLATFORM=$(get_toolset_value '.android.platform_min_version')
-ANDROID_BUILD_TOOL=$(get_toolset_value '.android.build_tools_min_version')
-ANDROID_EXTRA_LIST=($(get_toolset_value '.android."extra-list"[]'))
-ANDROID_ADDON_LIST=($(get_toolset_value '.android."addon-list"[]'))
-ANDROID_ADDITIONAL_TOOLS=($(get_toolset_value '.android."additional-tools"[]'))
-ANDROID_NDK_MAJOR_VERSIONS=($(get_toolset_value '.android.ndk."versions"[]'))
-ANDROID_NDK_MAJOR_DEFAULT=$(get_toolset_value '.android.ndk.default')
-ANDROID_NDK_MAJOR_LATEST=$(get_toolset_value '.android.ndk."versions"[-1]')
+android_platform=$(get_toolset_value '.android.platform_min_version')
+android_build_tool=$(get_toolset_value '.android.build_tools_min_version')
+android_extra_list=($(get_toolset_value '.android."extras"[]'))
+android_addon_list=($(get_toolset_value '.android."addons"[]'))
+android_additional_tools=($(get_toolset_value '.android."additional_tools"[]'))
+android_ndk_major_versions=($(get_toolset_value '.android.ndk."versions"[]'))
+android_ndk_major_default=$(get_toolset_value '.android.ndk.default')
+android_ndk_major_latest=$(get_toolset_value '.android.ndk."versions"[-1]')
 # Get the latest command line tools from https://developer.android.com/studio#cmdline-tools
 # Newer version(s) require Java 11 by default
 # See https://github.com/actions/runner-images/issues/6960
 ANDROID_HOME=$HOME/Library/Android/sdk
-ANDROID_OSX_SDK_FILE=tools-macosx.zip
 
 # Download the latest command line tools so that we can accept all of the licenses.
 # See https://developer.android.com/studio/#command-tools
 cmdlineToolsVersion=$(get_toolset_value '.android."cmdline-tools"')
 
 if [[ $cmdlineToolsVersion == "latest" ]]; then
-    repositoryXmlUrl="https://dl.google.com/android/repository/repository2-1.xml"
-    download_with_retries $repositoryXmlUrl "/tmp" "repository2-1.xml"
+    repository_xml_url="https://dl.google.com/android/repository/repository2-1.xml"
+    repository_xml_path=$(download_with_retry $repository_xml_url)
     cmdlineToolsVersion=$(
     yq -p=xml \
     '.sdk-repository.remotePackage[] | select(."+@path" == "cmdline-tools;latest" and .channelRef."+@ref" == "channel-0").archives.archive[].complete.url | select(contains("commandlinetools-mac"))' \
-    /tmp/repository2-1.xml
+    "$repository_xml_path"
     )
 
     if [[ -z $cmdlineToolsVersion ]]; then
@@ -60,16 +62,15 @@ if [[ $cmdlineToolsVersion == "latest" ]]; then
 fi
 
 echo "Downloading android command line tools..."
-download_with_retries "https://dl.google.com/android/repository/${cmdlineToolsVersion}" /tmp $ANDROID_OSX_SDK_FILE
+archive_path=$(download_with_retry "https://dl.google.com/android/repository/${cmdlineToolsVersion}")
 
 echo "Uncompressing android command line tools..."
-mkdir -p $HOME/Library/Android/sdk
-unzip -q /tmp/$ANDROID_OSX_SDK_FILE -d $HOME/Library/Android/sdk/cmdline-tools
-# Command line tools need to be placed in $HOME/Library/Android/sdk/cmdline-tools/latest to function properly
-mv $HOME/Library/Android/sdk/cmdline-tools/cmdline-tools $HOME/Library/Android/sdk/cmdline-tools/latest
-rm -f /tmp/$ANDROID_OSX_SDK_FILE
+mkdir -p "$ANDROID_HOME"
+unzip -q "$archive_path" -d "$ANDROID_HOME/cmdline-tools"
+# Command line tools need to be placed in $ANDROID_HOME/cmdline-tools/latest to function properly
+mv "$ANDROID_HOME/cmdline-tools/cmdline-tools" "$ANDROID_HOME/cmdline-tools/latest"
 
-echo ANDROID_HOME is $ANDROID_HOME
+echo ANDROID_HOME is "$ANDROID_HOME"
 export PATH=$PATH:$ANDROID_HOME/cmdline-tools/latest:$ANDROID_HOME/cmdline-tools/latest/bin
 
 SDKMANAGER=$ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager
@@ -78,15 +79,15 @@ echo "Installing latest tools & platform tools..."
 echo y | $SDKMANAGER "tools" "platform-tools"
 
 echo "Installing latest ndk..."
-for ndk_version in "${ANDROID_NDK_MAJOR_VERSIONS[@]}"
+for ndk_version in "${android_ndk_major_versions[@]}"
 do
     ndk_full_version=$(get_full_ndk_version $ndk_version)
     echo y | $SDKMANAGER "ndk;$ndk_full_version"
 done
 
-ndkDefault=$(get_full_ndk_version $ANDROID_NDK_MAJOR_DEFAULT)
+ndkDefault=$(get_full_ndk_version $android_ndk_major_default)
 ANDROID_NDK_HOME=$ANDROID_HOME/ndk/$ndkDefault
-ndkLatest=$(get_full_ndk_version $ANDROID_NDK_MAJOR_LATEST)
+ndkLatest=$(get_full_ndk_version $android_ndk_major_latest)
 ANDROID_NDK_LATEST_HOME=$ANDROID_HOME/ndk/$ndkLatest
 # ANDROID_NDK, ANDROID_NDK_HOME, and ANDROID_NDK_ROOT variables should be set as many customer builds depend on them https://github.com/actions/runner-images/issues/5879
 echo "export ANDROID_NDK=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc"
@@ -95,39 +96,37 @@ echo "export ANDROID_NDK_ROOT=$ANDROID_NDK_HOME" >> "${HOME}/.bashrc"
 echo "export ANDROID_NDK_LATEST_HOME=$ANDROID_NDK_LATEST_HOME" >> "${HOME}/.bashrc"
 
 availablePlatforms=($($SDKMANAGER --list | grep "platforms;android-[0-9]" | cut -d"|" -f 1 | sort -u))
-filter_components_by_version $ANDROID_PLATFORM "${availablePlatforms[@]}"
+add_filtered_instalaltion_components $android_platform "${availablePlatforms[@]}"
 
 allBuildTools=($($SDKMANAGER --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u))
 availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/})
-filter_components_by_version $ANDROID_BUILD_TOOL "${availableBuildTools[@]}"
+add_filtered_instalaltion_components $android_build_tool "${availableBuildTools[@]}"
 
 echo "y" | $SDKMANAGER ${components[@]}
 
-for extra_name in "${ANDROID_EXTRA_LIST[@]}"
+for extra_name in "${android_extra_list[@]}"
 do
     echo "Installing extra $extra_name ..."
     echo y | $SDKMANAGER "extras;$extra_name"
 done
 
-for addon_name in "${ANDROID_ADDON_LIST[@]}"
+for addon_name in "${android_addon_list[@]}"
 do
     echo "Installing add-on $addon_name ..."
     echo y | $SDKMANAGER "add-ons;$addon_name"
 done
 
-for tool_name in "${ANDROID_ADDITIONAL_TOOLS[@]}"
+for tool_name in "${android_additional_tools[@]}"
 do
     echo "Installing additional tool $tool_name ..."
     echo y | $SDKMANAGER "$tool_name"
 done
 
 # Download SDK tools to preserve backward compatibility
-sdkTools="android-sdk-tools.zip"
-sdkToolsVersion=$(get_toolset_value '.android."sdk-tools"')
-if [ "$sdkToolsVersion" != "null" ]; then
-    download_with_retries "https://dl.google.com/android/repository/${sdkToolsVersion}" "." $sdkTools
-    unzip -o -qq $sdkTools -d ${ANDROID_SDK_ROOT}
-    rm -f $sdkTools
+sdk_tools_version=$(get_toolset_value '.android."sdk-tools"')
+if [ "$sdk_tools_version" != "null" ]; then
+    sdk_tools_archive_path=$(download_with_retry "https://dl.google.com/android/repository/${sdk_tools_version}")
+    unzip -o -qq "$sdk_tools_archive_path" -d "${ANDROID_SDK_ROOT}"
 fi
 
 invoke_tests "Android"

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

@@ -0,0 +1,12 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-apache.sh
+##  Desc:  Install Apache HTTP Server
+################################################################################
+
+source ~/utils/utils.sh
+
+brew_smart_install httpd
+sudo sed -Ei '' 's/Listen .*/Listen 80/' $(brew --prefix)/etc/httpd/httpd.conf
+
+invoke_tests "WebServers" "Apache"

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

@@ -1,4 +1,9 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-audiodevice.sh
+##  Desc:  Install audio device
+################################################################################
+
 source ~/utils/utils.sh
 
 echo "install switchaudio-osx"

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

@@ -0,0 +1,20 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-aws-tools.sh
+##  Desc:  Install the AWS CLI, Session Manager plugin for the AWS CLI, and AWS SAM CLI
+################################################################################
+
+source ~/utils/utils.sh
+
+echo "Installing aws..."
+awscliv2_pkg_path=$(download_with_retry "https://awscli.amazonaws.com/AWSCLIV2.pkg")
+sudo installer -pkg "$awscliv2_pkg_path" -target /
+
+echo "Installing aws sam cli..."
+brew tap aws/tap
+brew_smart_install aws-sam-cli
+
+echo "Install aws cli session manager"
+brew install --cask session-manager-plugin
+
+invoke_tests "Common" "AWS"

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

@@ -0,0 +1,25 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-azcopy.sh
+##  Desc:  Install AzCopy
+################################################################################
+
+source ~/utils/utils.sh
+
+if is_Arm64; then
+    # latest is available by https://aka.ms/downloadazcopy-v10-mac-arm64
+    url="https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_darwin_arm64_10.21.2.zip"
+else
+    # latest is available by https://aka.ms/downloadazcopy-v10-mac
+    url="https://azcopyvnext.azureedge.net/releases/release-10.21.2-20231106/azcopy_darwin_amd64_10.21.2.zip"
+fi
+
+# Install AzCopy
+archive_path=$(download_with_retry ${url})
+unzip -qq $archive_path -d /tmp/azcopy
+extract_path=$(echo /tmp/azcopy/azcopy*)
+cp $extract_path/azcopy /usr/local/bin/azcopy
+chmod +x /usr/local/bin/azcopy
+
+
+invoke_tests "Common" "AzCopy"

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

@@ -0,0 +1,13 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-bicep.sh
+##  Desc:  Install bicep cli
+################################################################################
+
+source ~/utils/utils.sh
+
+echo "Installing bicep cli..."
+brew tap azure/bicep
+brew_smart_install bicep
+
+invoke_tests "Common" "Bicep"

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

@@ -0,0 +1,52 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-chrome.sh
+##  Desc:  Install chrome and chrome for testing browsers
+################################################################################
+
+source ~/utils/utils.sh
+arch=$(get_arch)
+
+echo "Installing Google Chrome..."
+brew install --cask google-chrome
+
+# Parse Google Chrome version
+full_chrome_version=$("/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" --version)
+full_chrome_version=${full_chrome_version#Google Chrome }
+chrome_version=${full_chrome_version%.*}
+echo "Google Chrome version is $full_chrome_version"
+
+# Get Google Chrome versions information
+chrome_platform="mac-$arch"
+CHROME_VERSIONS_URL="https://googlechromelabs.github.io/chrome-for-testing/latest-patch-versions-per-build-with-downloads.json"
+chrome_versions_json="$(cat $(download_with_retry "$CHROME_VERSIONS_URL"))"
+
+# Download and unpack the latest release of Chrome Driver
+chromedriver_version=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].version')
+echo "Installing Chrome Driver version $chromedriver_version"
+
+chromedriver_url=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].downloads.chromedriver[] | select(.platform=="'"${chrome_platform}"'").url')
+chromedriver_dir="/usr/local/share/chromedriver-$chrome_platform"
+chromedriver_bin="$chromedriver_dir/chromedriver"
+
+chromedriver_archive_path=$(download_with_retry $chromedriver_url)
+unzip -qq $chromedriver_archive_path -d /tmp/
+sudo mv /tmp/chromedriver-$chrome_platform $chromedriver_dir
+ln -s $chromedriver_bin /usr/local/bin/chromedriver
+echo "export CHROMEWEBDRIVER=$chromedriver_dir" >> ${HOME}/.bashrc
+
+# Download and unpack the latest release of Google Chrome for Testing
+chrome_for_testing_version=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].version')
+echo "Installing Google Chrome for Testing version $chrome_for_testing_version"
+
+chrome_for_testing_url=$(echo $chrome_versions_json | jq -r '.builds["'"$chrome_version"'"].downloads.chrome[] | select(.platform=="'"${chrome_platform}"'").url')
+chrome_for_testing_app="Google Chrome for Testing.app"
+
+chrome_for_testing_archive_path=$(download_with_retry $chrome_for_testing_url)
+unzip -qq $chrome_for_testing_archive_path -d /tmp/
+mv "/tmp/chrome-$chrome_platform/$chrome_for_testing_app" "/Applications/$chrome_for_testing_app"
+
+echo "Installing Selenium"
+brew_smart_install "selenium-server"
+
+invoke_tests "Browsers" "Chrome"

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

@@ -1,4 +1,8 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-cocoapods.sh
+##  Desc:  Install Cocoapods
+################################################################################
 
 # Setup the Cocoapods
 echo "Installing Cocoapods..."

images/macos/scripts/build/install-codeql-bundle.sh

@@ -0,0 +1,32 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-codeql-bundle.sh
+##  Desc:  Install CodeQL bundle
+################################################################################
+
+source ~/utils/utils.sh
+
+# Retrieve the CLI version of the latest CodeQL bundle.
+defaults_json_path=$(download_with_retry https://raw.githubusercontent.com/github/codeql-action/v2/src/defaults.json)
+bundle_version=$(jq -r '.cliVersion' $defaults_json_path)
+bundle_tag_name="codeql-bundle-v$bundle_version"
+
+echo "Downloading CodeQL bundle $bundle_version..."
+# Note that this is the all-platforms CodeQL bundle, to support scenarios where customers run
+# different operating systems within containers.
+archive_path=$(download_with_retry "https://github.com/github/codeql-action/releases/download/$bundle_tag_name/codeql-bundle.tar.gz")
+
+codeql_toolcache_path=$AGENT_TOOLSDIRECTORY/CodeQL/$bundle_version/x64
+mkdir -p $codeql_toolcache_path
+
+echo "Unpacking the downloaded CodeQL bundle archive..."
+tar -xzf $archive_path -C $codeql_toolcache_path
+
+# Touch a file to indicate to the CodeQL Action that this bundle shipped with the toolcache. This is
+# to support overriding the CodeQL version specified in defaults.json on GitHub Enterprise.
+touch $codeql_toolcache_path/pinned-version
+
+# Touch a file to indicate to the toolcache that setting up CodeQL is complete.
+touch $codeql_toolcache_path.complete
+
+invoke_tests "Common" "CodeQL Bundle"

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

@@ -1,10 +1,15 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-common-utils.sh
+##  Desc:  Install utils listed in toolset file
+################################################################################
+
 source ~/utils/utils.sh
 
 # Download and install YQ in cases when it is not available in the formulae as for macOS 11: https://formulae.brew.sh/formula/yq
 if is_BigSur; then
-    download_with_retries "https://github.com/mikefarah/yq/releases/latest/download/yq_darwin_amd64" "/tmp" "yq"
-    sudo install /tmp/yq /usr/local/bin/yq
+    binary_path=$(download_with_retry "https://github.com/mikefarah/yq/releases/latest/download/yq_darwin_amd64")
+    sudo install "$binary_path" /usr/local/bin/yq
 fi
 
 # Monterey needs future review:
@@ -22,10 +27,8 @@ for package in $cask_packages; do
     if is_Monterey && [[ $package == "virtualbox" ]]; then
         # Do not update VirtualBox on macOS 12 due to the issue with VMs in gurumediation state which blocks Vagrant on macOS: https://github.com/actions/runner-images/issues/8730
         # macOS host: Dropped all kernel extensions. VirtualBox relies fully on the hypervisor and vmnet frameworks provided by Apple now.
-        vbcask_url="https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb"
-        download_with_retries $vbcask_url
-        brew install ./virtualbox.rb
-        rm ./virtualbox.rb
+        virtualbox_cask_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/homebrew-cask/aa3c55951fc9d687acce43e5c0338f42c1ddff7b/Casks/virtualbox.rb")
+        brew install $virtualbox_cask_path
     else
         brew install --cask $package
     fi
@@ -48,7 +51,7 @@ if is_Monterey; then
                 osascript $HOME/utils/confirm-identified-developers.scpt $USER_PASSWORD
             } && break
 
-            if [ "$retry" -eq 0 ]; then
+            if [[ $retry -eq 0 ]]; then
                 echo "Executing AppleScript failed. No retries left"
                 exit 1
             fi
@@ -72,23 +75,20 @@ if is_Monterey; then
     dbQuery="SELECT * FROM kext_policy WHERE bundle_id LIKE 'com.parallels.kext.%';"
     kext=$(sudo sqlite3 $dbName "$dbQuery")
 
-    if [ -z "$kext" ]; then
+    if [[ -z $kext ]]; then
         echo "Parallels International GmbH not found"
         exit 1
     fi
 
     # Create env variable
     url=$(brew info --json=v2 --installed | jq -r '.casks[] | select(.name[] == "Parallels Desktop").url')
-    if [ -z "$url" ]; then
+    if [[ -z $url ]]; then
         echo "Unable to parse url for Parallels Desktop cask"
         exit 1
     fi
-    echo "export PARALLELS_DMG_URL=$url" >> "${HOME}/.bashrc"
+    echo "export PARALLELS_DMG_URL=$url" >> ${HOME}/.bashrc
 fi
 
-# Invoke bazel to download bazel version via bazelisk
-bazel
-
 # Install Azure DevOps extension for Azure Command Line Interface
 az extension add -n azure-devops
 

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

@@ -0,0 +1,57 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-dotnet.sh
+##  Desc:  Install dotnet
+################################################################################
+
+source ~/utils/utils.sh
+
+export DOTNET_CLI_TELEMETRY_OPTOUT=1
+
+arch=$(get_arch)
+
+# Download installer from dot.net and keep it locally
+DOTNET_INSTALL_SCRIPT="https://dot.net/v1/dotnet-install.sh"
+install_script_path=$(download_with_retry $DOTNET_INSTALL_SCRIPT)
+chmod +x $install_script_path
+
+args_list=()
+echo "Parsing dotnet SDK (except rc and preview versions) from .json..."
+
+dotnet_versions=($(get_toolset_value ".dotnet.arch[\"$arch\"].versions | .[]"))
+
+for dotnet_version in ${dotnet_versions[@]}; do
+    release_url="https://raw.githubusercontent.com/dotnet/core/main/release-notes/${dotnet_version}/releases.json"
+    releases_json_file=$(download_with_retry "$release_url")
+
+    if [[ $dotnet_version == "6.0" ]]; then
+        args_list+=(
+            $(cat $releases_json_file | jq -r 'first(.releases[].sdks[]?.version | select(contains("preview") or contains("rc") | not))')
+        )
+    else
+        args_list+=(
+            $(cat $releases_json_file | \
+            jq -r '.releases[].sdk."version"' | grep -v -E '\-(preview|rc)\d*' | \
+            sort -r | rev | uniq -s 2 | rev)
+        )
+    fi
+done
+
+for ARGS in ${args_list[@]}; do
+    $install_script_path --version $ARGS -NoPath --arch $arch
+done
+
+# dotnet installer doesn't create symlink to executable in /user/local/bin
+# Moreover at that moment /user/local/bin doesn't exist (though already added to $PATH)
+ln -s ~/.dotnet/dotnet /usr/local/bin/dotnet
+
+# Validate installation
+if [[ $(dotnet --list-sdks | wc -l) -lt "1" ]]; then
+    echo "The .NET Core SDK is not installed"
+    exit 1
+fi
+
+echo 'export PATH="$PATH:$HOME/.dotnet/tools"' >> $HOME/.bashrc
+echo "Dotnet operations have been completed successfully..."
+
+invoke_tests "Common" ".NET"

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

@@ -1,40 +1,39 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-edge.sh
+##  Desc:  Install edge browser
+################################################################################
+
 source ~/utils/utils.sh
 
 echo "Installing Microsoft Edge..."
 brew install --cask microsoft-edge
 
 EDGE_INSTALLATION_PATH="/Applications/Microsoft Edge.app/Contents/MacOS/Microsoft Edge"
-EDGE_VERSION=$("$EDGE_INSTALLATION_PATH" --version | cut -d' ' -f 3)
-EDGE_VERSION_MAJOR=$(echo $EDGE_VERSION | cut -d'.' -f 1)
+edge_version=$("$EDGE_INSTALLATION_PATH" --version | cut -d' ' -f 3)
+edge_version_major=$(echo $edge_version | cut -d'.' -f 1)
 
-echo "Version of Microsoft Edge: ${EDGE_VERSION}"
+echo "Version of Microsoft Edge: ${edge_version}"
 
 echo "Installing Microsoft Edge WebDriver..."
 
-EDGE_DRIVER_VERSION_URL="https://msedgedriver.azureedge.net/LATEST_RELEASE_${EDGE_VERSION_MAJOR}_MACOS"
-download_with_retries "$EDGE_DRIVER_VERSION_URL" "/tmp" "edge-version"
-EDGE_DRIVER_LATEST_VERSION=$(cat /tmp/edge-version | iconv -f utf-16 -t utf-8 | tr -d '\r')
-EDGE_DRIVER_URL="https://msedgedriver.azureedge.net/${EDGE_DRIVER_LATEST_VERSION}/edgedriver_mac64.zip"
+edge_driver_version_file_path=$(download_with_retry "https://msedgedriver.azureedge.net/LATEST_RELEASE_${edge_version_major}_MACOS")
+edge_driver_latest_version=$(iconv -f utf-16 -t utf-8 "$edge_driver_version_file_path" | tr -d '\r')
+edge_driver_url="https://msedgedriver.azureedge.net/${edge_driver_latest_version}/edgedriver_mac64.zip"
 
-echo "Compatible version of WebDriver: ${EDGE_DRIVER_LATEST_VERSION}"
+echo "Compatible version of WebDriver: ${edge_driver_latest_version}"
 
-pushd "/tmp" > /dev/null
-download_with_retries $EDGE_DRIVER_URL "." "edgedriver.zip"
+edge_driver_archive_path=$(download_with_retry "$edge_driver_url")
 
 # Move webdriver to the separate directory to be consistent with the docs
 # https://docs.microsoft.com/en-us/azure/devops/pipelines/test/continuous-test-selenium?view=azure-devops#decide-how-you-will-deploy-and-test-your-app
 
-APPLICATION="/usr/local/bin/msedgedriver"
-EDGEDRIVER_DIR="/usr/local/share/edge_driver"
-EDGEDRIVER_BIN="$EDGEDRIVER_DIR/msedgedriver"
+EDGE_DRIVER_DIR="/usr/local/share/edge_driver"
+mkdir -p $EDGE_DRIVER_DIR
+unzip -qq $edge_driver_archive_path -d $EDGE_DRIVER_DIR
+ln -s $EDGE_DRIVER_DIR/msedgedriver /usr/local/bin/msedgedriver
 
-mkdir -p $EDGEDRIVER_DIR
-
-unzip "edgedriver.zip" -d $EDGEDRIVER_DIR
-ln -s "$EDGEDRIVER_BIN" $APPLICATION
-echo "export EDGEWEBDRIVER=${EDGEDRIVER_DIR}" >> "${HOME}/.bashrc"
-popd > /dev/null
+echo "export EDGEWEBDRIVER=${EDGE_DRIVER_DIR}" >> ${HOME}/.bashrc
 
 # Configure Edge Updater to prevent auto update
 # https://learn.microsoft.com/en-us/deployedge/edge-learnmore-edgeupdater-for-macos

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

@@ -1,4 +1,9 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-firefox.sh
+##  Desc:  Install firefox browser
+################################################################################
+
 source ~/utils/utils.sh
 
 echo "Installing Firefox..."
@@ -9,6 +14,6 @@ brew_smart_install "geckodriver"
 geckoPath="$(brew --prefix geckodriver)/bin"
 
 echo "Add GECKOWEBDRIVER to bashrc..."
-echo "export GECKOWEBDRIVER=${geckoPath}" >> "${HOME}/.bashrc"
+echo "export GECKOWEBDRIVER=${geckoPath}" >> ${HOME}/.bashrc
 
 invoke_tests "Browsers" "Firefox"

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

@@ -1,4 +1,9 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-gcc.sh
+##  Desc:  Install GCC
+################################################################################
+
 source ~/utils/utils.sh
 
 gccVersions=$(get_toolset_value '.gcc.versions | .[]')
@@ -9,7 +14,7 @@ done
 
 # Delete default gfortran link if it exists https://github.com/actions/runner-images/issues/1280
 gfortranPath=$(which gfortran) || true
-if [ $gfortranPath ]; then
+if [[ $gfortranPath ]]; then
     rm $gfortranPath
 fi
 

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

@@ -1,12 +1,17 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-git.sh
+##  Desc:  Install Git and Git LFS
+################################################################################
+
 source ~/utils/utils.sh
 
-echo Installing Git...
+echo "Installing Git..."
 brew_smart_install "git"
 
 git config --global --add safe.directory "*"
 
-echo Installing Git LFS
+echo "Installing Git LFS"
 brew_smart_install "git-lfs"
 
 # Update global git config
@@ -14,7 +19,7 @@ git lfs install
 # Update system git config
 sudo git lfs install --system
 
-echo Disable all the Git help messages...
+echo "Disable all the Git help messages..."
 git config --global advice.pushUpdateRejected false
 git config --global advice.pushNonFFCurrent false
 git config --global advice.pushNonFFMatching false

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

@@ -0,0 +1,16 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-golang.sh
+##  Desc:  Install Go
+################################################################################
+
+source ~/utils/utils.sh
+
+default_go_version=$(get_toolset_value '.go.default')
+echo "Installing Go..."
+brew_smart_install "go@${default_go_version}"
+
+# Create symlinks to preserve backward compatibility. Symlinks are not created when non-latest go is being installed
+ln -sf $(brew --prefix go@${default_go_version})/bin/* /usr/local/bin/
+
+invoke_tests "Common" "Go"

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

@@ -1,10 +1,14 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-haskell.sh
+##  Desc:  Install Haskell
+################################################################################
 
 source ~/utils/utils.sh
 
-curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | sh
+curl --proto '=https' --tlsv1.2 -fsSL https://get-ghcup.haskell.org | bash
 export PATH="$HOME/.ghcup/bin:$PATH"
-echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc"
+echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> $HOME/.bashrc
 
 # ghcup output looks like this "ghc 8.6.4 base-4.12.0.0 hls-powered", need to take all the first versions only(8.6.4 in that case) and avoid pre-release ones
 availableVersions=$(ghcup list -t ghc -r | grep -v "prerelease" | awk '{print $2}')

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

@@ -1,12 +1,16 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-homebrew.sh
+##  Desc:  Install Homebrew
+################################################################################
 
 source ~/utils/utils.sh
 
 arch=$(get_arch)
 
 echo "Installing Homebrew..."
-download_with_retries "https://raw.githubusercontent.com/Homebrew/install/master/install.sh" "/tmp" "homebrew-install.sh"
-/bin/bash /tmp/homebrew-install.sh
+homebrew_installer_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/install/master/install.sh")
+/bin/bash $homebrew_installer_path
 
 if [[ $arch == "arm64" ]]; then
   /opt/homebrew/bin/brew update
@@ -36,4 +40,4 @@ echo "Installing wget..."
 brew_smart_install "wget"
 
 # init brew bundle feature
-brew tap Homebrew/bundle
+brew tap Homebrew/bundle

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

@@ -0,0 +1,13 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-llvm.sh
+##  Desc:  Install LLVM
+################################################################################
+
+source ~/utils/utils.sh
+
+llvmVersion=$(get_toolset_value '.llvm.version')
+
+brew_smart_install "llvm@${llvmVersion}"
+
+invoke_tests "LLVM"

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

@@ -0,0 +1,24 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-miniconda.sh
+##  Desc:  Install Miniconda
+################################################################################
+
+source ~/utils/utils.sh
+
+miniconda_installer_path=$(download_with_retry "https://repo.anaconda.com/miniconda/Miniconda3-latest-MacOSX-x86_64.sh")
+chmod +x $miniconda_installer_path
+sudo $miniconda_installer_path -b -p /usr/local/miniconda
+
+# Chmod with full permissions recursively to avoid permissions restrictions
+sudo chmod -R 777 /usr/local/miniconda
+
+sudo ln -s /usr/local/miniconda/bin/conda /usr/local/bin/conda
+
+if [[ -d $HOME/.conda ]]; then
+    sudo chown -R $USER $HOME/.conda
+fi
+
+echo "export CONDA=/usr/local/miniconda" >> $HOME/.bashrc
+
+invoke_tests "Common" "Miniconda"

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

@@ -1,4 +1,9 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-mongodb.sh
+##  Desc:  Install MongoDB
+################################################################################
+
 source ~/utils/utils.sh
 
 # MongoDB object-value database
@@ -9,10 +14,10 @@ toolsetVersion=$(get_toolset_value '.mongodb.version')
 brew tap mongodb/brew
 versionToInstall=$(brew search --formulae /mongodb-community@$toolsetVersion/ | awk -F'/' '{print $3}' | tail -1)
 echo "Installing mongodb $versionToInstall"
-brew_smart_install "$versionToInstall"
+brew_smart_install $versionToInstall
 
 if ! which mongo ; then
-    brew link "$versionToInstall"
+    brew link $versionToInstall
 fi
 
 invoke_tests "Databases" "MongoDB"

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

@@ -0,0 +1,51 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-mono.sh
+##  Desc:  Install Mono Framework
+################################################################################
+
+source ~/utils/utils.sh
+
+# Install Mono Framework
+mono_version_full=$(get_toolset_value '.mono.framework.version')
+mono_pkg_sha256=$(get_toolset_value '.mono.framework.sha256')
+mono_version=$(echo $mono_version_full | cut -d. -f 1,2,3)
+mono_version_short=$(echo $mono_version_full | cut -d. -f 1,2)
+mono_pkg_url="https://download.mono-project.com/archive/${mono_version}/macos-10-universal/MonoFramework-MDK-${mono_version_full}.macos10.xamarin.universal.pkg"
+MONO_VERSIONS_PATH='/Library/Frameworks/Mono.framework/Versions'
+
+mono_pkg_path=$(download_with_retry $mono_pkg_url)
+use_checksum_comparison $mono_pkg_path $mono_pkg_sha256
+echo "Installing Mono Framework ${mono_version_full}..."
+sudo installer -pkg $mono_pkg_path -target /
+
+# Download and install NUnit console
+nunit_version=$(get_toolset_value '.mono.nunit.version')
+nunit_archive_url="https://github.com/nunit/nunit-console/releases/download/${nunit_version}/NUnit.Console-${nunit_version}.zip"
+nunit_archive_sha256=$(get_toolset_value '.mono.nunit.sha256')
+NUNIT_PATH="/Library/Developer/nunit"
+nunit_version_path=$NUNIT_PATH/$nunit_version
+
+nunit_archive_path=$(download_with_retry $nunit_archive_url)
+use_checksum_comparison $nunit_archive_path $nunit_archive_sha256
+echo "Installing NUnit ${nunit_version}..."
+sudo mkdir -p $nunit_version_path
+sudo unzip -q $nunit_archive_path -d $nunit_version_path
+
+# Create a wrapper script for nunit3-console
+echo "Creating nunit3-console wrapper..."
+nunit3_console_wrapper=$(mktemp)
+cat <<EOF > "$nunit3_console_wrapper"
+#!/bin/bash -e -o pipefail
+exec ${MONO_VERSIONS_PATH}/${mono_version}/bin/mono --debug \$MONO_OPTIONS $nunit_version_path/nunit3-console.exe "\$@"
+EOF
+cat $nunit3_console_wrapper
+sudo chmod +x $nunit3_console_wrapper
+sudo mv $nunit3_console_wrapper "${MONO_VERSIONS_PATH}/${mono_version}/Commands/nunit3-console"
+
+# Create a symlink for the short version of Mono (e.g., 6.12)
+echo "Creating short symlink '${mono_version_short}'..."
+sudo ln -s ${MONO_VERSIONS_PATH}/${mono_version} ${MONO_VERSIONS_PATH}/${mono_version_short}
+
+# Invoke tests for Xamarin and Mono
+invoke_tests "Xamarin" "Mono"

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

@@ -0,0 +1,12 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-nginx.sh
+##  Desc:  Install Nginx
+################################################################################
+
+source ~/utils/utils.sh
+
+brew_smart_install nginx
+sudo sed -Ei '' 's/listen.*/listen 80;/' $(brew --prefix)/etc/nginx/nginx.conf
+
+invoke_tests "WebServers" "Nginx"

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

@@ -1,4 +1,9 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-node.sh
+##  Desc:  Install Node.js
+################################################################################
+
 source ~/utils/utils.sh
 
 defaultVersion=$(get_toolset_value '.node.default')
@@ -8,8 +13,8 @@ brew_smart_install "node@$defaultVersion"
 brew link node@$defaultVersion --force --overwrite
 
 echo Installing yarn...
-download_with_retries "https://yarnpkg.com/install.sh" "/tmp" "yarn-install.sh"
-bash /tmp/yarn-install.sh
+yarn_installer_path=$(download_with_retry "https://yarnpkg.com/install.sh")
+bash $yarn_installer_path
 
 if is_BigSur || is_Monterey; then
   npm_global_packages=$(get_toolset_value '.npm.global_packages[].name')

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

@@ -0,0 +1,27 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-nvm.sh
+##  Desc:  Install node version manager
+################################################################################
+
+source ~/utils/utils.sh
+
+[[ -n $API_PAT ]] && authString=(-H "Authorization: token ${API_PAT}")
+nvm_version=$(curl "${authString[@]}" -fsSL https://api.github.com/repos/nvm-sh/nvm/releases/latest | jq -r '.tag_name')
+nvm_installer_path=$(download_with_retry "https://raw.githubusercontent.com/nvm-sh/nvm/$nvm_version/install.sh")
+
+if bash $nvm_installer_path; then
+    source ~/.bashrc
+    nvm --version
+    for version in $(get_toolset_value '.node.nvm_versions[]'); do
+        nvm install "v${version}"
+    done
+
+    # set system node as default
+    nvm alias default system
+    echo "Node version manager has been installed successfully"
+else
+    echo "Node version manager installation failed"
+fi
+
+invoke_tests "Node" "nvm"

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

@@ -1,4 +1,9 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-openjdk.sh
+##  Desc:  Install openjdk
+################################################################################
+
 source ~/utils/utils.sh
 
 createEnvironmentVariable() {
@@ -13,15 +18,15 @@ createEnvironmentVariable() {
 
     if [[ ${DEFAULT} == "True" ]]; then
         echo "Setting up JAVA_HOME variable to ${INSTALL_PATH_PATTERN}"
-        echo "export JAVA_HOME=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc"
+        echo "export JAVA_HOME=${INSTALL_PATH_PATTERN}" >> ${HOME}/.bashrc
     fi
 
     if [[ $arch == "arm64" ]]; then
         echo "Setting up JAVA_HOME_${JAVA_VERSION}_arm64 variable to ${INSTALL_PATH_PATTERN}"
-        echo "export JAVA_HOME_${JAVA_VERSION}_arm64=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc"
+        echo "export JAVA_HOME_${JAVA_VERSION}_arm64=${INSTALL_PATH_PATTERN}" >> ${HOME}/.bashrc
     else
         echo "Setting up JAVA_HOME_${JAVA_VERSION}_X64 variable to ${INSTALL_PATH_PATTERN}"
-        echo "export JAVA_HOME_${JAVA_VERSION}_X64=${INSTALL_PATH_PATTERN}" >> "${HOME}/.bashrc"
+        echo "export JAVA_HOME_${JAVA_VERSION}_X64=${INSTALL_PATH_PATTERN}" >> ${HOME}/.bashrc
     fi
 }
 
@@ -29,16 +34,16 @@ installOpenJDK() {
     local JAVA_VERSION=$1
 
     # Get link for Java binaries and Java version
-    download_with_retries "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot" "/tmp" "openjdk-hotspot.json"
+    hotspot_json_path=$(download_with_retry "https://api.adoptium.net/v3/assets/latest/${JAVA_VERSION}/hotspot")
 
     if [[ $arch == "arm64" ]]; then
-        asset=$(jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="aarch64")' /tmp/openjdk-hotspot.json)
+        asset=$(jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="aarch64")' "$hotspot_json_path")
     else
-        asset=$(jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")' /tmp/openjdk-hotspot.json)
+        asset=$(jq -r '.[] | select(.binary.os=="mac" and .binary.image_type=="jdk" and .binary.architecture=="x64")' "$hotspot_json_path")
     fi
 
-    archivePath=$(echo ${asset} | jq -r '.binary.package.link')
-    fullVersion=$(echo ${asset} | jq -r '.version.semver' | tr '+' '-')
+    archive_url=$(echo "$asset" | jq -r '.binary.package.link')
+    fullVersion=$(echo "$asset" | jq -r '.version.semver' | tr '+' '-')
 
     # Remove 'LTS' suffix from the version if present
     fullVersion="${fullVersion//.LTS/}"
@@ -53,12 +58,12 @@ installOpenJDK() {
     fi
 
     # Download and extract Java binaries
-    download_with_retries ${archivePath} /tmp OpenJDK-${fullVersion}.tar.gz
+    archive_path=$(download_with_retry $archive_url)
 
     echo "Creating ${javaToolcacheVersionArchPath} directory"
     mkdir -p ${javaToolcacheVersionArchPath}
 
-    tar -xf /tmp/OpenJDK-${fullVersion}.tar.gz -C ${javaToolcacheVersionArchPath} --strip-components=1
+    tar -xf $archive_path -C ${javaToolcacheVersionArchPath} --strip-components=1
 
     # Create complete file
     if [[ $arch == "arm64" ]]; then

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

@@ -1,4 +1,9 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-openssl.sh
+##  Desc:  Install openssl
+################################################################################
+
 source ~/utils/utils.sh
 
 echo "Install [email protected]"

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

@@ -1,4 +1,9 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-php.sh
+##  Desc:  Install PHP
+################################################################################
+
 source ~/utils/utils.sh
 
 echo Installing PHP

images/macos/scripts/build/install-pipx-packages.sh

@@ -0,0 +1,18 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-pipx-packages.sh
+##  Desc:  Install Pipx Packages
+################################################################################
+
+source ~/utils/utils.sh
+
+export PATH="$PATH:/opt/pipx_bin"
+
+pipx_packages=$(get_toolset_value '.pipx[].package')
+
+for package in $pipx_packages; do
+    echo "Install $package into default python"
+    pipx install $package
+done
+
+invoke_tests "PipxPackages"

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

@@ -1,4 +1,9 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-postgresql.sh
+##  Desc:  Install PostgreSQL
+################################################################################
+
 source ~/utils/utils.sh
 
 # Fetch PostgreSQL version to install from the toolset
@@ -15,11 +20,11 @@ brew services start $postgreService
 echo "Check PostgreSQL service is running"
 i=10
 COMMAND='pg_isready'
-while [ $i -gt 0 ]; do
+while [[ $i -gt 0 ]]; do
     echo "Check PostgreSQL service status"
     eval $COMMAND && break
     ((i--))
-    if [ $i == 0 ]; then
+    if [[ $i == 0 ]]; then
         echo "PostgreSQL service not ready, all attempts exhausted"
         exit 1
     fi

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

@@ -1,26 +1,38 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-powershell.sh
+##  Desc:  Install PowerShell
+################################################################################
+
 source ~/utils/utils.sh
 
 echo Installing PowerShell...
 arch=$(get_arch)
 
-download_with_retries "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json" "/tmp" "powershell-metadata.json"
-psver=$(cat /tmp/powershell-metadata.json | jq -r '.LTSReleaseTag[0]')
-psDownloadUrl=$(get_github_package_download_url "PowerShell/PowerShell" "contains(\"osx-$arch.pkg\")" "$psver" "$API_PAT")
-download_with_retries $psDownloadUrl "/tmp" "powershell.pkg"
+metadata_json_path=$(download_with_retry "https://raw.githubusercontent.com/PowerShell/PowerShell/master/tools/metadata.json")
+pwshVersionToolset=$(get_toolset_value '.pwsh.version')
+pwshVersions=$(jq -r '.LTSReleaseTag[]' $metadata_json_path)
+
+for version in ${pwshVersions[@]}; do
+    if [[ "$version" =~ "$pwshVersionToolset" ]]; then
+        download_url=$(resolve_github_release_asset_url "PowerShell/PowerShell" "contains(\"osx-$arch.pkg\")" "$version" "$API_PAT")
+        break
+    fi
+done
+
+pkg_path=$(download_with_retry $download_url)
 
 # 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
-sudo xattr -rd com.apple.quarantine /tmp/powershell.pkg
+sudo xattr -rd com.apple.quarantine $pkg_path
 
-
-sudo installer -pkg /tmp/powershell.pkg -target /
+sudo installer -pkg $pkg_path -target /
 
 # Install PowerShell modules
 psModules=$(get_toolset_value '.powershellModules[].name')
 for module in ${psModules[@]}; do
     echo "Installing $module module"
     moduleVersions="$(get_toolset_value ".powershellModules[] | select(.name==\"$module\") | .versions[]?")"
-    if [[ -z "$moduleVersions" ]];then
+    if [[ -z $moduleVersions ]];then
         # Check MacOS architecture and sudo on Arm64
         if [[ $arch == "arm64" ]]; then
             sudo pwsh -command "& {Install-Module $module -Force -Scope AllUsers}"

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

@@ -1,29 +1,27 @@
 #!/bin/bash -e -o pipefail
 ################################################################################
-##  File:  pypy.sh
-##  Desc:  Installs PyPy
+##  File:  install-pypy.sh
+##  Desc:  Install PyPy
 ################################################################################
 
 source ~/utils/utils.sh
 
-function InstallPyPy
-{
-    PACKAGE_URL=$1
+InstallPyPy() {
+    local package_url=$1
 
-    PACKAGE_TAR_NAME=$(echo $PACKAGE_URL | awk -F/ '{print $NF}')
+    PACKAGE_TAR_NAME=$(basename $package_url)
     echo "Downloading tar archive '$PACKAGE_TAR_NAME'"
-    PACKAGE_TAR_TEMP_PATH="/tmp/$PACKAGE_TAR_NAME"
-    download_with_retries $PACKAGE_URL "/tmp" "$PACKAGE_TAR_NAME"
+    archive_path=$(download_with_retry $package_url)
 
     echo "Expand '$PACKAGE_TAR_NAME' to the /tmp folder"
-    tar xf $PACKAGE_TAR_TEMP_PATH -C /tmp
+    tar xf $archive_path -C /tmp
 
     # Get Python version
     PACKAGE_NAME=${PACKAGE_TAR_NAME/.tar.bz2/}
     MAJOR_VERSION=$(echo ${PACKAGE_NAME/pypy/} | cut -d. -f1)
     PYTHON_MAJOR="python$MAJOR_VERSION"
 
-    if [ $MAJOR_VERSION != 2 ]; then
+    if [[ $MAJOR_VERSION != 2 ]]; then
         PYPY_MAJOR="pypy$MAJOR_VERSION"
     else
         PYPY_MAJOR="pypy"
@@ -41,14 +39,14 @@ function InstallPyPy
     PYPY_TOOLCACHE_VERSION_ARCH_PATH=$PYPY_TOOLCACHE_VERSION_PATH/x64
 
     echo "Check if PyPy hostedtoolcache folder exist..."
-    if [ ! -d $PYPY_TOOLCACHE_PATH ]; then
+    if [[ ! -d $PYPY_TOOLCACHE_PATH ]]; then
         mkdir -p $PYPY_TOOLCACHE_PATH
     fi
 
     echo "Create PyPy '$PYPY_TOOLCACHE_VERSION_PATH' folder"
     mkdir $PYPY_TOOLCACHE_VERSION_PATH
 
-    echo "Move PyPy '$PACKAGE_TEMP_FOLDER' binaries to '$PYPY_TOOLCACHE_VERSION_ARCH_PATH' folder"
+    echo "Move PyPy $PACKAGE_TEMP_FOLDER binaries to $PYPY_TOOLCACHE_VERSION_ARCH_PATH folder"
     mv $PACKAGE_TEMP_FOLDER $PYPY_TOOLCACHE_VERSION_ARCH_PATH
 
     echo "Create additional symlinks (Required for UsePythonVersion Azure DevOps task)"
@@ -59,8 +57,8 @@ function InstallPyPy
     echo $PYPY_FULL_VERSION > "PYPY_VERSION"
 
     # Starting from PyPy 7.3.4 these links are already included in the package
-    [ -f ./$PYTHON_MAJOR ] || ln -s $PYPY_MAJOR $PYTHON_MAJOR
-    [ -f ./python ] || ln -s $PYTHON_MAJOR python
+    [[ -f ./$PYTHON_MAJOR ]] || ln -s $PYPY_MAJOR $PYTHON_MAJOR
+    [[ -f ./python ]] || ln -s $PYTHON_MAJOR python
 
     chmod +x ./python ./$PYTHON_MAJOR
 
@@ -70,22 +68,19 @@ function InstallPyPy
 
     echo "Create complete file"
     touch $PYPY_TOOLCACHE_VERSION_PATH/x64.complete
-
-    echo "Remove '$PACKAGE_TAR_TEMP_PATH'"
-    rm -f $PACKAGE_TAR_TEMP_PATH
 }
 
 arch=$(get_arch)
-download_with_retries "https://downloads.python.org/pypy/versions.json" "/tmp" "pypy-versions.json"
+versions_json_path=$(download_with_retry "https://downloads.python.org/pypy/versions.json")
 toolsetVersions=$(get_toolset_value '.toolcache[] | select(.name | contains("PyPy")) | .arch.'$arch'.versions[]')
 
 for toolsetVersion in $toolsetVersions; do
-    latestMajorPyPyVersion=$(cat /tmp/pypy-versions.json |
+    latestMajorPyPyVersion=$(cat $versions_json_path |
         jq -r --arg toolsetVersion $toolsetVersion '.[]
         | select((.python_version | startswith($toolsetVersion)) and .stable == true).files[]
         | select(.platform == "darwin").download_url' | head -1)
-    if [[ -z "$latestMajorPyPyVersion" ]]; then
-        echo "Failed to get PyPy version '$toolsetVersion'"
+    if [[ -z $latestMajorPyPyVersion ]]; then
+        echo "Failed to get PyPy version $toolsetVersion"
         exit 1
     fi
     InstallPyPy $latestMajorPyPyVersion

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

@@ -0,0 +1,53 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-python.sh
+##  Desc:  Install Python
+################################################################################
+
+source ~/utils/utils.sh
+
+echo "Installing Python Tooling"
+
+if is_Monterey || is_BigSur; then
+    echo "Install latest Python 2"
+    python2_pkg=$(download_with_retry "https://www.python.org/ftp/python/2.7.18/python-2.7.18-macosx10.9.pkg")
+    python2_pkg_sha256="c570f38b05dd8b112ad21b418cdf51a9816d62f9f44746452739d421be24d50c"
+    use_checksum_comparison $python2_pkg $python2_pkg_sha256
+
+    choice_changes_xml=$(mktemp /tmp/python2_choice_changes.xml.XXXXXX)
+    sudo installer -showChoiceChangesXML -pkg $python2_pkg -target / | tee $choice_changes_xml > /dev/null
+
+    # To avoid symlink conflicts, remove tools installation in /usr/local/bin using installer choices
+    xmllint --shell $choice_changes_xml <<EOF
+    cd //array/dict[string[text()='org.python.Python.PythonUnixTools-2.7']]/integer
+    set 0
+    save
+EOF
+
+    sudo installer -applyChoiceChangesXML $choice_changes_xml -pkg $python2_pkg -target /
+
+    pip install --upgrade pip
+
+    echo "Install Python2 certificates"
+    bash -c "/Applications/Python\ 2.7/Install\ Certificates.command"
+fi
+
+# Close Finder window
+if is_Veertu; then
+    close_finder_window
+fi
+
+echo "Brew Installing Python 3"
+brew_smart_install "[email protected]"
+
+echo "Installing pipx"
+export PIPX_BIN_DIR=/usr/local/opt/pipx_bin
+export PIPX_HOME=/usr/local/opt/pipx
+
+brew_smart_install "pipx"
+
+echo "export PIPX_BIN_DIR=${PIPX_BIN_DIR}" >> ${HOME}/.bashrc
+echo "export PIPX_HOME=${PIPX_HOME}" >> ${HOME}/.bashrc
+echo 'export PATH="$PIPX_BIN_DIR:$PATH"' >> ${HOME}/.bashrc
+
+invoke_tests "Python"

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

@@ -0,0 +1,8 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-rosetta.sh
+##  Desc:  Install Rosetta
+################################################################################
+
+echo "Installing Rosetta"
+/usr/sbin/softwareupdate --install-rosetta --agree-to-license

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

@@ -1,9 +1,14 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-ruby.sh
+##  Desc:  Install Ruby
+################################################################################
+
 source ~/utils/utils.sh
 
 arch=$(get_arch)
 DEFAULT_RUBY_VERSION=$(get_toolset_value '.ruby.default')
-echo Installing Ruby...
+echo "Installing Ruby..."
 brew_smart_install "ruby@${DEFAULT_RUBY_VERSION}"
 if [[ $arch == "arm64" ]]; then
     export PATH=/opt/homebrew/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH
@@ -11,12 +16,12 @@ else
     export PATH=/usr/local/opt/ruby@${DEFAULT_RUBY_VERSION}/bin:$PATH
 fi
 
-GEM_PATH=`gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}'`
-echo "GEM_PATH=$GEM_PATH" >> "$HOME/.bashrc"
+GEM_PATH=$(gem env|awk '/EXECUTABLE DIRECTORY/ {print $4}')
+echo "GEM_PATH=$GEM_PATH" >> $HOME/.bashrc
 if [[ $arch == "arm64" ]]; then
-    echo 'export PATH="$GEM_PATH:/opt/homebrew/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"'  >> "$HOME/.bashrc"
+    echo 'export PATH="$GEM_PATH:/opt/homebrew/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"'  >> $HOME/.bashrc
 else
-    echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"'  >> "$HOME/.bashrc"
+    echo 'export PATH="$GEM_PATH:/usr/local/opt/ruby@'${DEFAULT_RUBY_VERSION}'/bin:$PATH"'  >> $HOME/.bashrc
 fi
 
 if ! is_Arm64; then
@@ -24,13 +29,13 @@ if ! is_Arm64; then
     [ -n "$API_PAT" ] && authString=(-H "Authorization: token ${API_PAT}")
     PACKAGE_TAR_NAMES=$(curl "${authString[@]}" -fsSL "https://api.github.com/repos/ruby/ruby-builder/releases/latest" | jq -r '.assets[].name')
     TOOLSET_VERSIONS=$(get_toolset_value '.toolcache[] | select(.name | contains("Ruby")) | .arch.'$arch'.versions[]')
-    RUBY_PATH="$AGENT_TOOLSDIRECTORY/Ruby"
+    RUBY_PATH=$AGENT_TOOLSDIRECTORY/Ruby
 
     echo "Check if Ruby hostedtoolcache folder exists..."
-    if [ ! -d $RUBY_PATH ]; then
+    if [[ ! -d $RUBY_PATH ]]; then
         mkdir -p $RUBY_PATH
     fi
-
+    echo "ruby path - $RUBY_PATH "
     for TOOLSET_VERSION in ${TOOLSET_VERSIONS[@]}; do
         PACKAGE_TAR_NAME=$(echo "$PACKAGE_TAR_NAMES" | grep "^ruby-${TOOLSET_VERSION}-macos-latest.tar.gz$" | egrep -v "rc|preview" | sort -V | tail -1)
         RUBY_VERSION=$(echo "$PACKAGE_TAR_NAME" | cut -d'-' -f 2)
@@ -40,16 +45,16 @@ if ! is_Arm64; then
         mkdir -p $RUBY_VERSION_PATH
 
         echo "Downloading tar archive $PACKAGE_TAR_NAME"
-        DOWNLOAD_URL="https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}"
-        download_with_retries $DOWNLOAD_URL "/tmp" $PACKAGE_TAR_NAME
+        ARCHIVE_PATH=$(download_with_retry "https://github.com/ruby/ruby-builder/releases/download/toolcache/${PACKAGE_TAR_NAME}")
 
-        echo "Expand '$PACKAGE_TAR_NAME' to the '$RUBY_VERSION_PATH' folder"
-        tar xf "/tmp/$PACKAGE_TAR_NAME" -C $RUBY_VERSION_PATH
-        COMPLETE_FILE_PATH="$RUBY_VERSION_PATH/x64.complete"
-        if [ ! -f $COMPLETE_FILE_PATH ]; then
+        echo "Expand $PACKAGE_TAR_NAME to the $RUBY_VERSION_PATH folder"
+        tar xf $ARCHIVE_PATH -C $RUBY_VERSION_PATH
+        COMPLETE_FILE_PATH=$RUBY_VERSION_PATH/x64.complete
+        if [[ ! -f $COMPLETE_FILE_PATH ]]; then
             echo "Create complete file"
             touch $COMPLETE_FILE_PATH
         fi
     done
 fi
+
 invoke_tests "Ruby.$arch"

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

@@ -1,14 +1,19 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-rubygems.sh
+##  Desc:  Install RubyGems
+################################################################################
+
 source ~/utils/utils.sh
 
-echo Updating RubyGems...
+echo "Updating RubyGems..."
 gem update --system
 
 # Temporarily install activesupport 7.0.8 due to compatibility issues with cocoapods https://github.com/CocoaPods/CocoaPods/issues/12081
 gem install activesupport -v 7.0.8
 
 gemsToInstall=$(get_toolset_value '.ruby.rubygems | .[]')
-if [ -n "$gemsToInstall" ]; then
+if [[ -n $gemsToInstall ]]; then
     for gem in $gemsToInstall; do
         echo "Installing gem $gem"
         gem install $gem

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

@@ -0,0 +1,28 @@
+#!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-rust.sh
+##  Desc:  Install Rust
+################################################################################
+
+source ~/utils/utils.sh
+
+echo "Installing Rustup..."
+brew_smart_install "rustup-init"
+
+echo "Installing Rust language..."
+rustup-init -y --no-modify-path --default-toolchain=stable --profile=minimal
+
+echo "Initialize environment variables..."
+CARGO_HOME=$HOME/.cargo
+
+echo "Install common tools..."
+rustup component add rustfmt clippy
+
+if is_BigSur || is_Monterey; then
+    cargo install --locked bindgen-cli cbindgen cargo-audit cargo-outdated
+fi
+
+echo "Cleanup Cargo registry cached data..."
+rm -rf $CARGO_HOME/registry/*
+
+invoke_tests "Rust"

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

@@ -1,4 +1,8 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-safari.sh
+##  Desc:  Install Safari browser
+################################################################################
 
 echo "Enabling safari driver..."
 # https://developer.apple.com/documentation/webkit/testing_with_webdriver_in_safari
@@ -9,8 +13,8 @@ sudo safaridriver --enable
 echo "Enabling the 'Allow Remote Automation' option in Safari's Develop menu"
 mkdir -p $HOME/Library/WebDriver
 safari_plist="$HOME/Library/WebDriver/com.apple.Safari.plist"
-# "|| true" is needed to suppress exit code 1 in case if property or file doesn't exist 
+# "|| true" is needed to suppress exit code 1 in case if property or file doesn't exist
 /usr/libexec/PlistBuddy -c 'delete AllowRemoteAutomation' $safari_plist || true
 /usr/libexec/PlistBuddy -c 'add AllowRemoteAutomation bool true' $safari_plist
 
-invoke_tests "Browsers" "Safari"
+invoke_tests "Browsers" "Safari"

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

@@ -1,13 +1,18 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-swiftlint.sh
+##  Desc:  Install SwiftLint
+################################################################################
+
 source ~/utils/utils.sh
 
-echo Installing Swiftlint...
+echo "Installing Swiftlint..."
 if is_BigSur; then
   # 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
   COMMIT=d1d5743344227fe6e3c37cfba19f0cfe15a9448a
   FORMULA_URL="https://raw.githubusercontent.com/Homebrew/homebrew-core/$COMMIT/Formula/swiftlint.rb"
 
-  curl -fsSL "$FORMULA_URL" > $(find $(brew --repository) -name swiftlint.rb)
+  curl -fsSL $FORMULA_URL > $(find $(brew --repository) -name swiftlint.rb)
   HOMEBREW_NO_AUTO_UPDATE=1 HOMEBREW_NO_INSTALL_FROM_API=1 brew install swiftlint
 else
   brew_smart_install "swiftlint"

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

@@ -1,4 +1,9 @@
 #!/bin/bash -e -o pipefail
+################################################################################
+##  File:  install-vcpkg.sh
+##  Desc:  Install vcpkg
+################################################################################
+
 source ~/utils/utils.sh
 
 # Set env variable for vcpkg