From e32091634e0a9536b9943d1c92c53e9376837a76 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 29 Sep 2020 17:26:59 +0300 Subject: [PATCH 01/27] add dynamic installation for linux --- images/linux/scripts/installers/android.sh | 35 ++++++++++++++++------ images/linux/toolsets/toolset-1604.json | 8 ++--- images/linux/toolsets/toolset-1804.json | 8 ++--- images/linux/toolsets/toolset-2004.json | 8 ++--- 4 files changed, 32 insertions(+), 27 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 81f28ff7a..b630de7dd 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -9,6 +9,23 @@ set -e # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh +function install_android_packages { + minimumVersion=$( echo "$1" | sed 's/\.//g' ) + shift + toolsArr=("$@") + + for item in ${toolsArr[@]} + do + version=$(echo "${item##*[-;]}" | sed 's/\.//g') + echo "version is $version" + if (( $version >= $minimumVersion )) + then + echo "Start installing $item" + echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $item + fi + done +} + # Set env variable for SDK Root (https://developer.android.com/studio/command-line/variables) ANDROID_ROOT=/usr/local/lib/android ANDROID_SDK_ROOT=${ANDROID_ROOT}/sdk @@ -42,22 +59,22 @@ else fi toolset="$INSTALLER_SCRIPT_FOLDER/toolset.json" -platforms=$(jq -r '.android.platform_list[]|"platforms;" + .' $toolset) -buildtools=$(jq -r '.android.build_tools[]|"build-tools;" + .' $toolset) +minimumBuildToolVersion=$(jq -r '.android.build_tools_min_version' $toolset) +minimumPlatformVersion=$(jq -r '.android.platform_min_version' $toolset) extras=$(jq -r '.android.extra_list[]|"extras;" + .' $toolset) addons=$(jq -r '.android.addon_list[]|"add-ons;" + .' $toolset) additional=$(jq -r '.android.additional_tools[]' $toolset) # Install the following SDKs and build tools, passing in "y" to accept licenses. -echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $platforms $buildtools $extras $google_api_list $addons $additional +echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $extras $google_api_list $addons $additional -# Document what was added to the image +platforms=$(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android" | sed -E "s/[[:space:]]+//g" | sed -E "s/\|.*//g") +buildTools=$(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "build-tools;" | sed -E "s/[[:space:]]+//g" | sed -E "s/\|.*//g") -google_api_versions_list=$(echo "$addons"|awk -F- '/addon-google_apis-google/ {print $5}') -constraint_layout_versions_list=$(echo "$extras"|awk -F';' '/constraint-layout;/ {print $8}') -constraint_layout_solver_versions_list=$(echo "$extras"|awk -F';' '/constraint-layout-solver;/ {print $8}') -platform_versions_list=$(echo "$platforms"|awk -F- '{print $2}') -buildtools_versions_list=$(echo "$buildtools"|awk -F';' '{print $2}') +platformsArr=(${platforms}) +install_android_packages $minimumPlatformVersion "${platformsArr[@]}" +buildToolsArr=(${buildTools}) +install_android_packages $minimumBuildToolVersion "${buildToolsArr[@]}" # Add required permissions chmod -R a+rwx ${ANDROID_SDK_ROOT} diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 46aad66ad..4d7bbe0e7 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -62,12 +62,8 @@ } ], "android": { - "platform_list": [ - "android-30", "android-29", "android-28", "android-27", "android-26", "android-25", "android-24", "android-23", "android-22", "android-21", "android-19","android-17","android-15","android-10" - ], - "build_tools": [ - "30.0.2", "30.0.1", "30.0.0", "29.0.3", "29.0.2", "29.0.0", "28.0.3", "28.0.2", "28.0.1", "28.0.0", "27.0.3", "27.0.2", "27.0.1", "27.0.0", "26.0.3", "26.0.2", "26.0.1", "26.0.0", "25.0.3", "25.0.2", "25.0.1", "25.0.0", "24.0.3", "24.0.2", "24.0.1", "24.0.0", "23.0.3", "23.0.2", "23.0.1", "22.0.1", "21.1.2", "20.0.0", "19.1.0", "17.0.0" - ], + "platform_min_version": "10", + "build_tools_min_version": "17.0.0", "extra_list": [ "android;m2repository", "google;m2repository", diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 2670b4cf3..24e36c217 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -62,12 +62,8 @@ } ], "android": { - "platform_list": [ - "android-30", "android-29", "android-28", "android-27", "android-26", "android-25", "android-24", "android-23", "android-22", "android-21", "android-19","android-17" - ], - "build_tools": [ - "30.0.2", "30.0.1", "30.0.0", "29.0.3", "29.0.2", "29.0.0", "28.0.3", "28.0.2", "28.0.1", "28.0.0", "27.0.3", "27.0.2", "27.0.1", "27.0.0", "26.0.3", "26.0.2", "26.0.1", "26.0.0", "25.0.3", "25.0.2", "25.0.1", "25.0.0", "24.0.3", "24.0.2", "24.0.1", "24.0.0", "23.0.3", "23.0.2", "23.0.1", "22.0.1", "21.1.2", "20.0.0", "19.1.0", "17.0.0" - ], + "platform_min_version": "17", + "build_tools_min_version": "17.0.0", "extra_list": [ "android;m2repository", "google;m2repository", diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 5ac230255..ba86c827e 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -48,12 +48,8 @@ } ], "android": { - "platform_list": [ - "android-30", "android-29", "android-28", "android-27" - ], - "build_tools": [ - "30.0.2", "30.0.1", "30.0.0", "29.0.3", "29.0.2", "29.0.0", "28.0.3", "28.0.2", "28.0.1", "28.0.0", "27.0.3", "27.0.2", "27.0.1", "27.0.0" - ], + "platform_min_version": "27", + "build_tools_min_version": "27.0.0", "extra_list": [ "android;m2repository", "google;m2repository", From 89bf727a192d32243de1da348b947fd64538a29e Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 1 Oct 2020 11:03:39 +0300 Subject: [PATCH 02/27] add function to check version --- images/linux/scripts/installers/android.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index b630de7dd..0e78dbe0c 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -9,16 +9,20 @@ set -e # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh +verlte() { + sortedVersion=$(echo -e "$1\n$2" | sort -V | head -n1) + [ "$1" = "$sortedVersion" ] +} + function install_android_packages { - minimumVersion=$( echo "$1" | sed 's/\.//g' ) + minimumVersion=$1 shift toolsArr=("$@") for item in ${toolsArr[@]} do - version=$(echo "${item##*[-;]}" | sed 's/\.//g') - echo "version is $version" - if (( $version >= $minimumVersion )) + version=$(echo "${item##*[-;]}") + if verlte $minimumVersion $version then echo "Start installing $item" echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $item From d0f8592d884c5005edb5086ea6844fecab550ecb Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 1 Oct 2020 13:07:40 +0300 Subject: [PATCH 03/27] add function and clean up logic for array --- images/linux/scripts/helpers/install.sh | 5 +++++ images/linux/scripts/installers/android.sh | 17 +++++------------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/images/linux/scripts/helpers/install.sh b/images/linux/scripts/helpers/install.sh index 414980bb2..bb1befe22 100644 --- a/images/linux/scripts/helpers/install.sh +++ b/images/linux/scripts/helpers/install.sh @@ -42,4 +42,9 @@ download_with_retries() { ## fi function IsPackageInstalled { dpkg -S $1 &> /dev/null +} + +verlte() { + sortedVersion=$(echo -e "$1\n$2" | sort -V | head -n1) + [ "$1" = "$sortedVersion" ] } \ No newline at end of file diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 0e78dbe0c..5365458d2 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -9,12 +9,7 @@ set -e # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh -verlte() { - sortedVersion=$(echo -e "$1\n$2" | sort -V | head -n1) - [ "$1" = "$sortedVersion" ] -} - -function install_android_packages { +function install_android_package_gte_then { minimumVersion=$1 shift toolsArr=("$@") @@ -72,13 +67,11 @@ additional=$(jq -r '.android.additional_tools[]' $toolset) # Install the following SDKs and build tools, passing in "y" to accept licenses. echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $extras $google_api_list $addons $additional -platforms=$(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android" | sed -E "s/[[:space:]]+//g" | sed -E "s/\|.*//g") -buildTools=$(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "build-tools;" | sed -E "s/[[:space:]]+//g" | sed -E "s/\|.*//g") +platforms=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1 | sed 's/platforms;android-//g')) +buildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "build-tools;" | cut -d"|" -f 1 | sed 's/build-tools;//g')) -platformsArr=(${platforms}) -install_android_packages $minimumPlatformVersion "${platformsArr[@]}" -buildToolsArr=(${buildTools}) -install_android_packages $minimumBuildToolVersion "${buildToolsArr[@]}" +install_android_package_gte_then $minimumPlatformVersion "${platforms[@]}" +install_android_package_gte_then $minimumBuildToolVersion "${buildTools[@]}" # Add required permissions chmod -R a+rwx ${ANDROID_SDK_ROOT} From 16a27e20454d516beafa3d8ad96be3c4eac7953a Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 1 Oct 2020 13:08:53 +0300 Subject: [PATCH 04/27] add import --- images/linux/scripts/installers/android.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 5365458d2..e72a39f01 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -8,6 +8,7 @@ set -e # Source the helpers for use with the script source $HELPER_SCRIPTS/os.sh +source $HELPER_SCRIPTS/install.sh function install_android_package_gte_then { minimumVersion=$1 From 9956daab66bc926250cad276c8d095e8e050866c Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Thu, 1 Oct 2020 16:33:20 +0300 Subject: [PATCH 05/27] fix function accroding to comments --- images/linux/scripts/installers/android.sh | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index e72a39f01..c09159394 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -10,7 +10,7 @@ set -e source $HELPER_SCRIPTS/os.sh source $HELPER_SCRIPTS/install.sh -function install_android_package_gte_then { +function filter_components_by_version { minimumVersion=$1 shift toolsArr=("$@") @@ -20,8 +20,7 @@ function install_android_package_gte_then { version=$(echo "${item##*[-;]}") if verlte $minimumVersion $version then - echo "Start installing $item" - echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $item + components+=($item) fi done } @@ -66,13 +65,15 @@ addons=$(jq -r '.android.addon_list[]|"add-ons;" + .' $toolset) additional=$(jq -r '.android.additional_tools[]' $toolset) # Install the following SDKs and build tools, passing in "y" to accept licenses. -echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager $extras $google_api_list $addons $additional +components=( "${extras[@]}" "${addons[@]}" "${additional[@]}" ) -platforms=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1 | sed 's/platforms;android-//g')) -buildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "build-tools;" | cut -d"|" -f 1 | sed 's/build-tools;//g')) +availablePlatforms=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1)) +availableBuildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "build-tools;" | cut -d"|" -f 1)) -install_android_package_gte_then $minimumPlatformVersion "${platforms[@]}" -install_android_package_gte_then $minimumBuildToolVersion "${buildTools[@]}" +filter_components_by_version $minimumPlatformVersion "${availablePlatforms[@]}" +filter_components_by_version $minimumBuildToolVersion "${availableBuildTools[@]}" + +echo "y" | ${ANDROID_SDK_ROOT}/tools/bin/sdkmanager ${components[@]} # Add required permissions chmod -R a+rwx ${ANDROID_SDK_ROOT} From 6a8fd16499f8312b3f37b1c2abd9e733644db245 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Fri, 2 Oct 2020 13:54:37 +0300 Subject: [PATCH 06/27] get all build-tools --- images/linux/scripts/installers/android.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index c09159394..62c505c4a 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -68,7 +68,8 @@ additional=$(jq -r '.android.additional_tools[]' $toolset) components=( "${extras[@]}" "${addons[@]}" "${additional[@]}" ) availablePlatforms=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "platforms;android-" | cut -d"|" -f 1)) -availableBuildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list | sed -n '/Available Packages:/,/^$/p' | grep "build-tools;" | cut -d"|" -f 1)) +allBuildTools=($(${ANDROID_SDK_ROOT}/tools/bin/sdkmanager --list --include_obsolete | grep "build-tools;" | cut -d"|" -f 1 | sort -u)) +availableBuildTools=$(echo ${allBuildTools[@]//*rc[0-9]/}) filter_components_by_version $minimumPlatformVersion "${availablePlatforms[@]}" filter_components_by_version $minimumBuildToolVersion "${availableBuildTools[@]}" From 3187ff66cf7f4db36e77fc0183c7f7214b9bcc08 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Mon, 5 Oct 2020 10:46:06 +0300 Subject: [PATCH 07/27] add comment --- images/linux/scripts/installers/android.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/images/linux/scripts/installers/android.sh b/images/linux/scripts/installers/android.sh index 62c505c4a..90d2013ab 100644 --- a/images/linux/scripts/installers/android.sh +++ b/images/linux/scripts/installers/android.sh @@ -17,6 +17,7 @@ function filter_components_by_version { for item in ${toolsArr[@]} do + # take the last argument after spliting string by ';'' and '-'' version=$(echo "${item##*[-;]}") if verlte $minimumVersion $version then From 1ce450def9dbfa548344e55a2c90e41ead7c7d88 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Tue, 6 Oct 2020 11:09:20 +0300 Subject: [PATCH 08/27] Remove Xcode 12 beta --- images/macos/provision/core/xcode-tools.sh | 19 +++---------------- images/macos/tests/Xcode.Tests.ps1 | 8 ++++---- images/macos/toolsets/toolset-10.15.json | 2 +- images/macos/toolsets/toolset-11.0.json | 2 +- 4 files changed, 9 insertions(+), 22 deletions(-) diff --git a/images/macos/provision/core/xcode-tools.sh b/images/macos/provision/core/xcode-tools.sh index ef9bf648c..643dc2932 100755 --- a/images/macos/provision/core/xcode-tools.sh +++ b/images/macos/provision/core/xcode-tools.sh @@ -35,13 +35,7 @@ do echo "Extracting Xcode.app ($VERSION_TO_INSTALL) to ${WORK_DIR} ..." extractXcodeXip $WORK_DIR "$VERSION_TO_INSTALL" - # Remove "beta" postfix from version - if [[ $XCODE_VERSION == "12_beta" ]] && is_Catalina ; then - # trick to install Xcode 12 GM and Xcode 12 beta 6 side by side - XCODE_VERSION="12_beta" - else - XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1) - fi + XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1) echo "Checking if unpacked Xcode ${XCODE_VERSION} is valid" validateXcodeIntegrity "$WORK_DIR" @@ -55,9 +49,7 @@ do # Creating a symlink for all Xcode 10* and Xcode 9.3, 9.4 to stay backwards compatible with consumers of the Xcode beta version createBetaSymlink $XCODE_VERSION - if [ ! $(echo $XCODE_VERSION | grep "beta") ]; then - createXamarinProvisionatorSymlink "$XCODE_VERSION" - fi + createXamarinProvisionatorSymlink "$XCODE_VERSION" find $WORK_DIR -mindepth 1 -delete done @@ -74,12 +66,7 @@ do continue fi - if [[ $XCODE_VERSION == "12_beta" ]] && is_Catalina ; then - # trick to install Xcode 12 GM and Xcode 12 beta 6 side by side - XCODE_VERSION="12_beta" - else - XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1) - fi + XCODE_VERSION=$(echo $XCODE_VERSION | cut -d"_" -f 1) echo "Running 'runFirstLaunch' for Xcode ${XCODE_VERSION}..." runFirstLaunch $XCODE_VERSION diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1 index ff8d5e932..f8e7ccfe8 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/tests/Xcode.Tests.ps1 @@ -40,7 +40,7 @@ Describe "Xcode" { It "Xcode has correct beta symlink" -TestCases $testCases { param ( [string] $XcodeVersion ) - $xcodesWithBetaSymlink = @("12", "12_beta", "9.3", "9.4") + $xcodesWithBetaSymlink = @("12", "9.3", "9.4") $shouldBetaSymlinkExists = $XcodeVersion.StartsWith("10") -or $XcodeVersion.StartsWith("11") -or ($XcodeVersion -in $xcodesWithBetaSymlink) $betaSymlinkPath = Get-XcodeRootPath -Version "${XcodeVersion}_beta" @@ -76,7 +76,7 @@ Describe "Xcode" { $variableName = "XCODE_${MajorXcodeVersion}_DEVELOPER_DIR" $actualPath = Get-EnvironmentVariable $variableName $expectedPath = Join-Path (Get-XcodeRootPath -Version $ExpectedVersion) "Contents/Developer" - + $actualPath | Should -Exist $actualPath | Should -Be $expectedPath } @@ -86,13 +86,13 @@ Describe "Xcode" { Describe "Xcode simulators" { $XCODE_VERSIONS | Where-Object { Test-XcodeStableVersion $_ } | ForEach-Object { Switch-Xcode -Version $_ - + Context "$_" { It "No duplicates in devices" { [array]$devicesList = @(Get-XcodeDevicesList | Where-Object { $_ }) Validate-ArrayWithoutDuplicates $devicesList -Because "Found duplicate device simulators" } - + It "No duplicates in pairs" { [array]$pairsList = @(Get-XcodePairsList | Where-Object { $_ }) Validate-ArrayWithoutDuplicates $pairsList -Because "Found duplicate pairs simulators" diff --git a/images/macos/toolsets/toolset-10.15.json b/images/macos/toolsets/toolset-10.15.json index f834385c2..e5bef8d57 100644 --- a/images/macos/toolsets/toolset-10.15.json +++ b/images/macos/toolsets/toolset-10.15.json @@ -2,7 +2,7 @@ "xcode": { "default": "11.7", "versions": [ - "12.2_beta", "12", "12_beta", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" + "12.2_beta", "12", "11.7", "11.6", "11.5", "11.4.1", "11.4", "11.3.1", "11.2.1", "11.1", "11", "10.3" ] }, "xamarin": { diff --git a/images/macos/toolsets/toolset-11.0.json b/images/macos/toolsets/toolset-11.0.json index f4e9a57c8..93ada0d73 100644 --- a/images/macos/toolsets/toolset-11.0.json +++ b/images/macos/toolsets/toolset-11.0.json @@ -2,7 +2,7 @@ "xcode": { "default": "11.7", "versions": [ - "12.2_beta", "12_beta", "11.7" + "12.2_beta", "11.7" ] }, "xamarin": { From f80d9cdc669cc741543b468fad41f45b109da026 Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Tue, 6 Oct 2020 11:11:36 +0300 Subject: [PATCH 09/27] reuse function --- images/macos/helpers/Xcode.Helpers.psm1 | 23 ++++++++--------------- images/macos/tests/Xcode.Tests.ps1 | 4 ++-- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/images/macos/helpers/Xcode.Helpers.psm1 b/images/macos/helpers/Xcode.Helpers.psm1 index 8ea137e63..52a182d57 100644 --- a/images/macos/helpers/Xcode.Helpers.psm1 +++ b/images/macos/helpers/Xcode.Helpers.psm1 @@ -46,11 +46,17 @@ function Switch-Xcode { } function Test-XcodeStableRelease { - param( - [Parameter(Mandatory)] + param ( + [Parameter(ParameterSetName = 'Version')] + [string] $Version, + [Parameter(ParameterSetName = 'Path')] [string] $XcodeRootPath ) + if ($PSCmdlet.ParameterSetName -eq "Version") { + $XcodeRootPath = Get-XcodeRootPath $Version + } + $licenseInfoPlistPath = Join-Path $XcodeRootPath "Contents" "Resources" "LicenseInfo.plist" $releaseType = & defaults read $licenseInfoPlistPath "licenseType" return -not ($releaseType -match "beta") @@ -102,17 +108,4 @@ function Get-XcodePairsList { $result += "$watchName $phoneName" } return $result -} - -function Test-XcodeStableVersion { - param([Parameter(Mandatory)][string]$Version) - - if ($Version -match "beta") { - return $false - } - if ($Version -match "GM") { - return $false - } - - return $true } \ No newline at end of file diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1 index f8e7ccfe8..dc03e400a 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/tests/Xcode.Tests.ps1 @@ -56,7 +56,7 @@ Describe "Xcode" { } Context "XCODE_DEVELOPER_DIR" { - $stableXcodeVersions = $XCODE_VERSIONS | Where-Object { Test-XcodeStableVersion $_ } + $stableXcodeVersions = $XCODE_VERSIONS | Where-Object { Test-XcodeStableRelease -Version $_ } $majorXcodeVersions = $stableXcodeVersions | ForEach-Object { $_.Split(".")[0] } | Select-Object -Unique $testCases = $majorXcodeVersions | ForEach-Object { $majorXcodeVersion = $_ @@ -84,7 +84,7 @@ Describe "Xcode" { } Describe "Xcode simulators" { - $XCODE_VERSIONS | Where-Object { Test-XcodeStableVersion $_ } | ForEach-Object { + $XCODE_VERSIONS | Where-Object { Test-XcodeStableRelease -Version $_ } | ForEach-Object { Switch-Xcode -Version $_ Context "$_" { From 75a1fd1897ff9b43211ed3181659a982fd561d52 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 6 Oct 2020 13:56:12 +0300 Subject: [PATCH 10/27] Fix ghcup pattern --- images/macos/provision/core/haskell.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index 33fa38dbb..36453f2b7 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -4,7 +4,10 @@ curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh export PATH="$HOME/.ghcup/bin:$PATH" echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc" -availableVersions=$(ghcup list | grep -v "prerelease" | grep "ghc " | awk '{print $3}') +# ghcup output looks like this "x ghc 8.8.3 base-4.13.0.0 hls-powered", need to take all the first versions only(8.8.3 in that case) and avoid pre-release ones +availableVersions=$(ghcup list | grep -v "prerelease" | grep "ghc " | grep -Eo ' ([0-9]*\.){2}[0-9]*' | tr -d ' ') + +# Install 3 latest major versions(For instance 8.6.5, 8.8.4, 8.10.2) minorMajorVersions=$(echo "$availableVersions" | cut -d"." -f 1,2 | uniq | tail -n3) for majorMinorVersion in $minorMajorVersions; do fullVersion=$(echo "$availableVersions" | grep "$majorMinorVersion." | tail -n1) From d6627e143a5a5b1530f9716cefa525aad9429352 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 6 Oct 2020 14:30:00 +0300 Subject: [PATCH 11/27] change pattern --- images/macos/provision/core/haskell.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index 36453f2b7..89d8706c7 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -5,7 +5,7 @@ export PATH="$HOME/.ghcup/bin:$PATH" echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc" # ghcup output looks like this "x ghc 8.8.3 base-4.13.0.0 hls-powered", need to take all the first versions only(8.8.3 in that case) and avoid pre-release ones -availableVersions=$(ghcup list | grep -v "prerelease" | grep "ghc " | grep -Eo ' ([0-9]*\.){2}[0-9]*' | tr -d ' ') +availableVersions=$(ghcup list -t ghc -r | grep -v "prerelease" | awk '{print $2}') # Install 3 latest major versions(For instance 8.6.5, 8.8.4, 8.10.2) minorMajorVersions=$(echo "$availableVersions" | cut -d"." -f 1,2 | uniq | tail -n3) From 44f565e921258049b201af149ba6fc340cdc7759 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev Date: Tue, 6 Oct 2020 14:32:37 +0300 Subject: [PATCH 12/27] fix comment --- images/macos/provision/core/haskell.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/provision/core/haskell.sh b/images/macos/provision/core/haskell.sh index 89d8706c7..1bc11d915 100644 --- a/images/macos/provision/core/haskell.sh +++ b/images/macos/provision/core/haskell.sh @@ -4,7 +4,7 @@ curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | sh export PATH="$HOME/.ghcup/bin:$PATH" echo 'export PATH="$PATH:$HOME/.ghcup/bin"' >> "$HOME/.bashrc" -# ghcup output looks like this "x ghc 8.8.3 base-4.13.0.0 hls-powered", need to take all the first versions only(8.8.3 in that case) and avoid pre-release ones +# 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}') # Install 3 latest major versions(For instance 8.6.5, 8.8.4, 8.10.2) From 539aed4037dbecf26519e646b3608733daeb4e6d Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Tue, 6 Oct 2020 15:50:59 +0300 Subject: [PATCH 13/27] add python 3.9 --- images/linux/toolsets/toolset-1604.json | 3 ++- images/linux/toolsets/toolset-1804.json | 3 ++- images/linux/toolsets/toolset-2004.json | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/images/linux/toolsets/toolset-1604.json b/images/linux/toolsets/toolset-1604.json index 46aad66ad..162e1264d 100644 --- a/images/linux/toolsets/toolset-1604.json +++ b/images/linux/toolsets/toolset-1604.json @@ -11,7 +11,8 @@ "3.5.*", "3.6.*", "3.7.*", - "3.8.*" + "3.8.*", + "3.9.*" ] }, { diff --git a/images/linux/toolsets/toolset-1804.json b/images/linux/toolsets/toolset-1804.json index 2670b4cf3..ecad19154 100644 --- a/images/linux/toolsets/toolset-1804.json +++ b/images/linux/toolsets/toolset-1804.json @@ -11,7 +11,8 @@ "3.5.*", "3.6.*", "3.7.*", - "3.8.*" + "3.8.*", + "3.9.*" ] }, { diff --git a/images/linux/toolsets/toolset-2004.json b/images/linux/toolsets/toolset-2004.json index 7c704263b..f7fde89fb 100644 --- a/images/linux/toolsets/toolset-2004.json +++ b/images/linux/toolsets/toolset-2004.json @@ -11,7 +11,8 @@ "3.5.*", "3.6.*", "3.7.*", - "3.8.*" + "3.8.*", + "3.9.*" ] }, { From e51422d95e75240a199c100ecc705e291049a6d5 Mon Sep 17 00:00:00 2001 From: Dmitry Shibanov Date: Wed, 7 Oct 2020 11:59:01 +0300 Subject: [PATCH 14/27] add import utils --- images/macos/provision/core/openssl.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/images/macos/provision/core/openssl.sh b/images/macos/provision/core/openssl.sh index 0638dccf8..a1976e7f9 100755 --- a/images/macos/provision/core/openssl.sh +++ b/images/macos/provision/core/openssl.sh @@ -1,4 +1,7 @@ #!/bin/sh + +source ~/utils/utils.sh + echo "Installing OpenSSL..." export PATH="/usr/local/bin:/usr/local/sbin:~/bin:$PATH" From bab7c0d07f6488df433abd7d8474cab9adebed4c Mon Sep 17 00:00:00 2001 From: Maxim Lobanov Date: Wed, 7 Oct 2020 12:19:32 +0300 Subject: [PATCH 15/27] Update Xcode.Tests.ps1 --- images/macos/tests/Xcode.Tests.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/macos/tests/Xcode.Tests.ps1 b/images/macos/tests/Xcode.Tests.ps1 index dc03e400a..74bbee4a6 100644 --- a/images/macos/tests/Xcode.Tests.ps1 +++ b/images/macos/tests/Xcode.Tests.ps1 @@ -56,7 +56,7 @@ Describe "Xcode" { } Context "XCODE_DEVELOPER_DIR" { - $stableXcodeVersions = $XCODE_VERSIONS | Where-Object { Test-XcodeStableRelease -Version $_ } + $stableXcodeVersions = $testCases | Where-Object { Test-XcodeStableRelease -Version $_ } $majorXcodeVersions = $stableXcodeVersions | ForEach-Object { $_.Split(".")[0] } | Select-Object -Unique $testCases = $majorXcodeVersions | ForEach-Object { $majorXcodeVersion = $_ From 7459f57aac13730a54734c8e8d7977979a0a456b Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 7 Oct 2020 11:48:57 +0000 Subject: [PATCH 16/27] Updating readme file for macos-10.15 version 20201003.1 (#1737) Co-authored-by: no-reply@microsoft.com Co-authored-by: Actions service account --- images/macos/macos-10.15-Readme.md | 227 +++++++++++------------------ 1 file changed, 85 insertions(+), 142 deletions(-) diff --git a/images/macos/macos-10.15-Readme.md b/images/macos/macos-10.15-Readme.md index af4024fc6..7a506d8b0 100644 --- a/images/macos/macos-10.15-Readme.md +++ b/images/macos/macos-10.15-Readme.md @@ -1,7 +1,13 @@ +| Announcements | +|-| +| [Default Xcode will be changed to Xcode 12.0 on October, 20](https://github.com/actions/virtual-environments/issues/1712) | +| [Xcode 11.0, 11.1, 11.4.0 will be deprecated on October, 20](https://github.com/actions/virtual-environments/issues/1688) | +| [Remove Xcode 12 beta 6 from MacOS Catalina image in favor of Xcode 12.2 beta 1 on October 13](https://github.com/actions/virtual-environments/issues/1646) | +*** # macOS 10.15 info -- System Version: macOS 10.15.6 (19G2021) +- System Version: macOS 10.15.7 (19H2) - Kernel Version: Darwin 19.6.0 -- Image Version: 20200918.1 +- Image Version: 20201003.1 ## Installed Software ### Language and Runtime @@ -10,17 +16,17 @@ - gcc-9 (Homebrew GCC 9.3.0) 9.3.0 - available by `gcc-9` alias - GNU Fortran (Homebrew GCC 8.4.0_1) 8.4.0 - available by `gfortran-8` alias - GNU Fortran (Homebrew GCC 9.3.0) 9.3.0 - available by `gfortran-9` alias -- Node.js v12.18.3 +- R 4.0.2 +- Node.js v12.18.4 - NVM 0.35.3 -- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.1 v12.18.4 v13.14.0 v14.11.0 +- NVM - Cached node versions: v6.17.1 v8.17.0 v10.22.1 v12.18.4 v13.14.0 v14.13.0 - Python 2.7.17 - Python 3.8.5 - Ruby 2.6.6p146 - .NET SDK 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.602 2.1.603 2.1.604 2.1.607 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.200 3.1.201 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 -- R 4.0.2 - Go 1.15.2 -- PHP 7.4.10 -- julia 1.5.1 +- PHP 7.4.11 +- julia 1.5.2 ### Package Management - Vcpkg 2020.06.15 @@ -29,7 +35,7 @@ - Bundler version 2.1.4 - Carthage 0.36.0 - CocoaPods 1.9.3 -- Homebrew 2.5.1 +- Homebrew 2.5.2 - NPM 6.14.6 - Yarn 1.22.5 - NuGet 5.6.0.6489 @@ -40,7 +46,7 @@ ### Project Management - Apache Maven 3.6.3 - Gradle 6.6.1 -- Apache Ant(TM) 1.10.8 +- Apache Ant(TM) 1.10.9 ### Utilities - Curl 7.72.0 @@ -50,7 +56,7 @@ - Hub CLI: 2.14.2 - GNU Wget 1.20.3 - Subversion (SVN) 1.14.0 -- Packer 1.6.2 +- Packer 1.6.4 - OpenSSL 1.0.2t 10 Sep 2019 `(/usr/local/opt/openssl -> /usr/local/Cellar/openssl@1.0.2t/1.0.2t)` - jq 1.6 - gpg (GnuPG) 2.2.23 @@ -59,44 +65,44 @@ - aria2 1.35.0 - azcopy 10.6.0 - zstd 1.4.5 -- bazel 3.5.0 +- bazel 3.5.1 - bazelisk 1.6.1 -- helm v3.3.2+ge507725 -- virtualbox 6.1.14r140239 +- helm v3.3.4+ga61ce56 - mongo v4.4.0 - mongod v4.4.0 -- Vagrant 2.2.10 - 7-Zip 16.02 - Newman 5.2.0 +- virtualbox 6.1.14r140239 +- Vagrant 2.2.10 - GNU parallel 20200722 ### Tools -- Fastlane 2.160.0 -- Cmake 3.18.2 -- App Center CLI 2.7.0 -- Azure CLI 2.11.1 -- AWS CLI 2.0.48 -- AWS SAM CLI 1.2.0 +- Fastlane 2.162.0 +- Cmake 3.18.3 +- App Center CLI 2.7.1 +- Azure CLI 2.12.1 +- AWS CLI 2.0.54 +- AWS SAM CLI 1.4.0 - AWS Session Manager CLI 1.1.61.0 -- Aliyun CLI 3.0.58 -- GHCup v0.1.10 -- GHC 8.10.2 +- Aliyun CLI 3.0.59 +- GHCup v0.1.11 +- GHC 8.8.4 - Cabal 3.2.0.0 - Stack 2.3.3 ### Linters -- yamllint 1.24.2 -- SwiftLint 0.40.2 +- yamllint 1.25.0 +- SwiftLint 0.40.3 ### Browsers - Safari 14.0 (15610.1.28.1.9) - SafariDriver 14.0 (15610.1.28.1.9) -- Google Chrome 85.0.4183.102 +- Google Chrome 85.0.4183.121 - ChromeDriver 85.0.4183.87 -- Microsoft Edge 85.0.564.51 -- MSEdgeDriver 85.0.564.51 -- Mozilla Firefox 80.0.1 +- Microsoft Edge 85.0.564.68 +- MSEdgeDriver 85.0.564.68 +- Mozilla Firefox 81.0.1 - geckodriver 0.27.0 ### Java @@ -120,17 +126,17 @@ - 3.5.10 - 3.6.12 - 3.7.9 -- 3.8.5 +- 3.8.6 #### PyPy -- 2.7.13 [PyPy 7.3.1] -- 3.6.9 [PyPy 7.3.1] +- 2.7.13 [PyPy 7.3.2] +- 3.6.9 [PyPy 7.3.2] #### Node.js - 8.17.0 - 10.22.1 - 12.18.4 -- 14.11.0 +- 14.13.0 #### Go - 1.11.13 @@ -145,9 +151,9 @@ #### Packages - Bindgen 0.55.1 -- Cbindgen 0.14.4 +- Cbindgen 0.14.6 - Cargo-outdated v0.9.11 -- Cargo-audit 0.12.0 +- Cargo-audit 0.12.1 ### PowerShell Tools - PowerShell 7.0.3 @@ -155,13 +161,13 @@ #### PowerShell Modules | Module | Version | | ---------- | ------- | -| Az | 4.6.1 | +| Az | 4.7.0 | | MarkdownPS | 1.9 | | Pester | 5.0.4 | ### Xamarin #### Visual Studio for Mac -- 8.7.7.10 +- 8.7.8.4 #### Mono - 6.12.0.93 @@ -171,6 +177,7 @@ - 6.4.0.208 #### Xamarin.iOS +- 14.0.0.0 - 13.20.2.2 - 13.18.2.1 - 13.16.0.13 @@ -205,9 +212,9 @@ ### Xcode | Version | Build | Path | | -------------- | -------- | ------------------------------- | -| 12.2 | 12B5018i | /Applications/Xcode_12.2.app | -| 12.0 | 12A8189n | /Applications/Xcode_12_beta.app | +| 12.2 | 12B5025f | /Applications/Xcode_12.2.app | | 12.0 | 12A7209 | /Applications/Xcode_12.app | +| 12.0 | 12A8189n | /Applications/Xcode_12_beta.app | | 11.7 (default) | 11E801a | /Applications/Xcode_11.7.app | | 11.6 | 11E708 | /Applications/Xcode_11.6.app | | 11.5 | 11E608c | /Applications/Xcode_11.5.app | @@ -280,110 +287,46 @@ | DriverKit 20.0 | driverkit.macosx20.0 | 12.0, 12.2 | #### Installed Simulators -| OS | Xcode Version | Simulators | -| ----------- | -------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| iOS 12.4 | 10.3 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPhone XR
iPhone Xs
iPhone Xs Max
iPad (5th generation)
iPad (6th generation)
iPad Air
iPad Air (3rd generation)
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (11-inch)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) | -| iOS 13.0 | 11.0 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) | -| iOS 13.1 | 11.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) | -| iOS 13.2 | 11.2.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) | -| iOS 13.3 | 11.3.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) | -| iOS 13.4 | 11.4
11.4.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | -| iOS 13.5 | 11.5 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | -| iOS 13.6 | 11.6 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | -| iOS 13.7 | 11.7 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | -| iOS 14.0 | 12.0
12.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad (8th generation)
iPad Air (3rd generation)
iPad Air (4th generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | -| tvOS 12.4 | 10.3 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.0 | 11.0
11.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.2 | 11.2.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.3 | 11.3.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 13.4 | 11.4
11.4.1
11.5
11.6
11.7 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| tvOS 14.0 | 12.0
12.0 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | -| watchOS 5.3 | 10.3 | Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm
Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm | -| watchOS 6.0 | 11.0
11.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | -| watchOS 6.1 | 11.2.1
11.3.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | -| watchOS 6.2 | 11.4
11.4.1
11.5
11.6
11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | -| watchOS 7.0 | 12.0
12.0 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm
Apple Watch Series 6 - 40mm
Apple Watch Series 6 - 44mm | +| OS | Xcode Version | Simulators | +| ----------- | -------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| iOS 12.4 | 10.3 | iPhone 5s
iPhone 6
iPhone 6 Plus
iPhone 6s
iPhone 6s Plus
iPhone 7
iPhone 7 Plus
iPhone 8
iPhone 8 Plus
iPhone SE
iPhone X
iPhone XR
iPhone Xs
iPhone Xs Max
iPad (5th generation)
iPad (6th generation)
iPad Air
iPad Air (3rd generation)
iPad Air 2
iPad Pro (10.5-inch)
iPad Pro (11-inch)
iPad Pro (11-inch) (1st generation)
iPad Pro (12.9-inch)
iPad Pro (12.9-inch) (2nd generation)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) | +| iOS 13.0 | 11.0 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (11-inch) (1st generation)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) | +| iOS 13.1 | 11.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (11-inch) (1st generation)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) | +| iOS 13.2 | 11.2.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (11-inch) (1st generation)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) | +| iOS 13.3 | 11.3.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch)
iPad Pro (11-inch) (1st generation)
iPad Pro (12.9-inch) (3rd generation)
iPad Pro (9.7-inch) | +| iOS 13.4 | 11.4
11.4.1 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | +| iOS 13.5 | 11.5 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | +| iOS 13.6 | 11.6 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | +| iOS 13.7 | 11.7 | iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad Air (3rd generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | +| iOS 14.0 | 12.0
12.0 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad (8th generation)
iPad Air (3rd generation)
iPad Air (4th generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | +| iOS 14.2 | 12.2 | iPod touch (7th generation)
iPhone 11
iPhone 11 Pro
iPhone 11 Pro Max
iPhone 8
iPhone 8 Plus
iPhone SE (2nd generation)
iPad (7th generation)
iPad (8th generation)
iPad Air (3rd generation)
iPad Air (4th generation)
iPad Pro (11-inch) (2nd generation)
iPad Pro (12.9-inch) (4th generation)
iPad Pro (9.7-inch) | +| tvOS 12.4 | 10.3 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.0 | 11.0
11.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.2 | 11.2.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.3 | 11.3.1 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 13.4 | 11.4
11.4.1
11.5
11.6
11.7 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 14.0 | 12.0
12.0 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| tvOS 14.2 | 12.2 | Apple TV
Apple TV 4K
Apple TV 4K (at 1080p) | +| watchOS 5.3 | 10.3 | Apple Watch Series 2 - 38mm
Apple Watch Series 2 - 42mm
Apple Watch Series 3 - 38mm
Apple Watch Series 3 - 42mm
Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm | +| watchOS 6.0 | 11.0
11.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 6.1 | 11.2.1
11.3.1 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 6.2 | 11.4
11.4.1
11.5
11.6
11.7 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm | +| watchOS 7.0 | 12.0
12.0 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm
Apple Watch Series 6 - 40mm
Apple Watch Series 6 - 44mm | +| watchOS 7.1 | 12.2 | Apple Watch Series 4 - 40mm
Apple Watch Series 4 - 44mm
Apple Watch Series 5 - 40mm
Apple Watch Series 5 - 44mm
Apple Watch Series 6 - 40mm
Apple Watch Series 6 - 44mm | ### Android -#### Android SDK Tools -| Package Name | Description | -| ------------ | ---------------------------------- | -| tools | Android SDK Tools, Revision 26.1.1 | - -#### Android SDK Platform-Tools -| Package Name | Description | -| -------------- | ------------------------------------------- | -| platform-tools | Android SDK Platform-Tools, Revision 30.0.4 | - -#### Android SDK Platforms -| Package Name | Description | -| ------------ | ----------------------------------- | -| android-24 | Android SDK Platform 24, Revision 2 | -| android-25 | Android SDK Platform 25, Revision 3 | -| android-26 | Android SDK Platform 26, Revision 2 | -| android-27 | Android SDK Platform 27, Revision 3 | -| android-28 | Android SDK Platform 28, Revision 6 | -| android-29 | Android SDK Platform 29, Revision 5 | -| android-30 | Android SDK Platform 30, Revision 3 | - -#### Android SDK Build-Tools -| Package Name | Description | -| ------------------ | ---------------------------------------- | -| build-tools-24.0.0 | Android SDK Build-Tools, Revision 24.0.0 | -| build-tools-24.0.1 | Android SDK Build-Tools, Revision 24.0.1 | -| build-tools-24.0.2 | Android SDK Build-Tools, Revision 24.0.2 | -| build-tools-24.0.3 | Android SDK Build-Tools, Revision 24.0.3 | -| build-tools-25.0.0 | Android SDK Build-Tools, Revision 25.0.0 | -| build-tools-25.0.1 | Android SDK Build-Tools, Revision 25.0.1 | -| build-tools-25.0.2 | Android SDK Build-Tools, Revision 25.0.2 | -| build-tools-25.0.3 | Android SDK Build-Tools, Revision 25.0.3 | -| build-tools-26.0.0 | Android SDK Build-Tools, Revision 26.0.0 | -| build-tools-26.0.1 | Android SDK Build-Tools, Revision 26.0.1 | -| build-tools-26.0.2 | Android SDK Build-Tools, Revision 26.0.2 | -| build-tools-26.0.3 | Android SDK Build-Tools, Revision 26.0.3 | -| build-tools-27.0.0 | Android SDK Build-Tools, Revision 27.0.0 | -| build-tools-27.0.1 | Android SDK Build-Tools, Revision 27.0.1 | -| build-tools-27.0.2 | Android SDK Build-Tools, Revision 27.0.2 | -| build-tools-27.0.3 | Android SDK Build-Tools, Revision 27.0.3 | -| build-tools-28.0.0 | Android SDK Build-Tools, Revision 28.0.0 | -| build-tools-28.0.1 | Android SDK Build-Tools, Revision 28.0.1 | -| build-tools-28.0.2 | Android SDK Build-Tools, Revision 28.0.2 | -| build-tools-28.0.3 | Android SDK Build-Tools, Revision 28.0.3 | -| build-tools-29.0.0 | Android SDK Build-Tools, Revision 29.0.0 | -| build-tools-29.0.1 | Android SDK Build-Tools, Revision 29.0.1 | -| build-tools-29.0.2 | Android SDK Build-Tools, Revision 29.0.2 | -| build-tools-29.0.3 | Android SDK Build-Tools, Revision 29.0.3 | -| build-tools-30.0.0 | Android SDK Build-Tools, Revision 30.0.0 | -| build-tools-30.0.1 | Android SDK Build-Tools, Revision 30.0.1 | -| build-tools-30.0.2 | Android SDK Build-Tools, Revision 30.0.2 | - -#### Android NDKs -| Version | Path | -| ------------ | ------------------------------------------ | -| 15.2.4203891 | $HOME/Library/Android/sdk/android-ndk-r15c | -| 18.1.5063045 | $HOME/Library/Android/sdk/ndk/18.1.5063045 | -| 21.3.6528147 | $HOME/Library/Android/sdk/ndk-bundle | - -#### Android Utils -| Package Name | Version | -| ---------------- | ----------- | -| cmake | 3.6.4111459 | -| Android Emulator | 30.0.26 | - -#### Android Google APIs -| Package Name | Description | -| --------------------------- | ----------------------- | -| addon-google_apis-google-21 | Google APIs, Revision 1 | -| addon-google_apis-google-22 | Google APIs, Revision 1 | -| addon-google_apis-google-23 | Google APIs, Revision 1 | -| addon-google_apis-google-24 | Google APIs, Revision 1 | - -#### Extra Packages -| Package Name | Version | -| ----------------------------------------------- | ------- | -| Android Support Repository | 47.0.0 | -| Google Play services | 49 | -| Google Repository | 58 | -| Intel x86 Emulator Accelerator (HAXM installer) | 7.5.1 | +| Package Name | Version | +| -------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| Android SDK Tools | 26.1.1 | +| Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2) | +| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3 | +| Android SDK Platform-Tools | 30.0.4 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Android Support Repository | 47.0.0 | +| Google Play services | 49 | +| Google Repository | 58 | +| SDK Patch Applier v4 | 1 | +| CMake | 3.6.4111459 | +| NDK | 15.2.4203891
18.1.5063045
21.3.6528147 | From 17d233cac55acb75f4df25a77070e5866ee6b635 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Wed, 7 Oct 2020 17:14:00 +0300 Subject: [PATCH 17/27] [macOS] Set $ErrorActionPreference = "Stop" in SoftwareReport.Generator.ps1 (#1692) * $ErrorActionPreference = "Stop" * revert changes for ubuntu --- images/macos/software-report/SoftwareReport.Generator.ps1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/images/macos/software-report/SoftwareReport.Generator.ps1 b/images/macos/software-report/SoftwareReport.Generator.ps1 index 0ef53471e..aaf4f6446 100644 --- a/images/macos/software-report/SoftwareReport.Generator.ps1 +++ b/images/macos/software-report/SoftwareReport.Generator.ps1 @@ -4,6 +4,8 @@ param ( $ImageName ) +$ErrorActionPreference = "Stop" + Import-Module MarkdownPS Import-Module "$PSScriptRoot/SoftwareReport.Common.psm1" -DisableNameChecking Import-Module "$PSScriptRoot/SoftwareReport.Xcode.psm1" -DisableNameChecking From 020349c8e6645d8083207670c6f2582bfc8b7619 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov Date: Wed, 7 Oct 2020 18:26:40 +0300 Subject: [PATCH 18/27] replace 2>&1 to Get-CommandResult --- .../SoftwareReport/SoftwareReport.Common.psm1 | 16 ++++++++++------ .../SoftwareReport.Generator.ps1 | 2 ++ .../SoftwareReport/SoftwareReport.Tools.psm1 | 18 ++++++++++++------ 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 index 9d910ddcc..46fd0d24f 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Common.psm1 @@ -5,14 +5,16 @@ function Get-OSName { } function Get-CPPVersions { - $cppVersions = apt list --installed 2>&1 | Where-Object { $_ -match "g\+\+-\d+"} | ForEach-Object { + $result = Get-CommandResult "apt list --installed" -Multiline + $cppVersions = $result.Output | Where-Object { $_ -match "g\+\+-\d+"} | ForEach-Object { & $_.Split("/")[0] --version | Select-Object -First 1 | Take-OutputPart -Part 3 } | Sort-Object {[Version]$_} return "GNU C++ " + ($cppVersions -Join ", ") } function Get-FortranVersions { - $fortranVersions = apt list --installed 2>&1 | Where-Object { $_ -match "^gfortran-\d+"} | ForEach-Object { + $result = Get-CommandResult "apt list --installed" -Multiline + $fortranVersions = $result.Output | Where-Object { $_ -match "^gfortran-\d+"} | ForEach-Object { $_ -match "now (?\d+\.\d+\.\d+)-" | Out-Null $Matches.version } | Sort-Object {[Version]$_} @@ -21,7 +23,8 @@ function Get-FortranVersions { function Get-ClangVersions { $clangVersions = @() - $clangVersions = apt list --installed 2>&1 | Where-Object { $_ -match "^clang-\d+"} | ForEach-Object { + $result = Get-CommandResult "apt list --installed" -Multiline + $clangVersions = $result.Output | Where-Object { $_ -match "^clang-\d+"} | ForEach-Object { $clangCommand = ($_ -Split "/")[0] Invoke-Expression "$clangCommand --version" | Where-Object { $_ -match "clang version" } | ForEach-Object { $_ -match "clang version (?\d+\.\d+\.\d+)-" | Out-Null @@ -153,14 +156,15 @@ function Get-MavenVersion { return "Maven $mavenVersion" } function Get-SbtVersion { - $result = sbt -version 2>&1 | Out-String - $result -match "sbt script version: (?\d+\.\d+\.\d+)" | Out-Null + $result = Get-CommandResult "sbt -version" + $result.Output -match "sbt script version: (?\d+\.\d+\.\d+)" | Out-Null $sbtVersion = $Matches.version return "Sbt $sbtVersion" } function Get-PHPVersions { - return $(apt list --installed 2>&1) | Where-Object { $_ -match "^php\d+\.\d+/"} | ForEach-Object { + $result = Get-CommandResult "apt list --installed" -Multiline + return $result.Output | Where-Object { $_ -match "^php\d+\.\d+/"} | ForEach-Object { $_ -match "now (?\d+\.\d+\.\d+)-" | Out-Null $Matches.version } diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 index ac8c26dd7..e35eaa142 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Generator.ps1 @@ -3,6 +3,8 @@ param ( $OutputDirectory ) +$ErrorActionPreference = "Stop" + Import-Module MarkdownPS Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Android.psm1") -DisableNameChecking Import-Module (Join-Path $PSScriptRoot "SoftwareReport.Browsers.psm1") -DisableNameChecking diff --git a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 index 2c98ecbcb..457725110 100644 --- a/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 +++ b/images/linux/scripts/SoftwareReport/SoftwareReport.Tools.psm1 @@ -24,7 +24,8 @@ function Get-BazelVersion { } function Get-BazeliskVersion { - $bazeliskVersion = bazelisk version 2>&1 | Select-String "Bazelisk version:" | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "v" + $result = Get-CommandResult "bazelisk version" -Multiline + $bazeliskVersion = $result.Output | Select-String "Bazelisk version:" | Take-OutputPart -Part 2 | Take-OutputPart -Part 0 -Delimiter "v" return "Bazelisk $bazeliskVersion" } @@ -77,12 +78,14 @@ function Get-DockerBuildxVersion { } function Get-GitVersion { - $gitVersion = git --version 2>&1 | Take-OutputPart -Part 2 + $result = Get-CommandResult "git --version" + $gitVersion = $result.Output | Take-OutputPart -Part 2 return "Git $gitVersion" } function Get-GitLFSVersion { - $gitlfsversion = git-lfs --version 2>&1 | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" + $result = Get-CommandResult "git-lfs --version" + $gitlfsversion = $result.Output | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" return "Git LFS $gitlfsversion" } @@ -215,12 +218,14 @@ function Get-AlibabaCloudCliVersion { } function Get-AWSCliVersion { - $awsVersion = aws --version 2>&1 | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" + $result = Get-CommandResult "aws --version" + $awsVersion = $result.Output | Take-OutputPart -Part 0 | Take-OutputPart -Part 1 -Delimiter "/" return "AWS CLI $awsVersion" } function Get-AWSCliSessionManagerPluginVersion { - return "AWS CLI Session manager plugin $(session-manager-plugin --version 2>&1)" + $result = (Get-CommandResult "session-manager-plugin --version").Output + return "AWS CLI Session manager plugin $result" } function Get-AWSSAMVersion { @@ -253,7 +258,8 @@ function Get-ORASCliVersion { } function Get-VerselCliversion { - return "$(vercel --version 2>&1 | Select-Object -First 1)" + $result = Get-CommandResult "vercel --version" -Multiline + return $result.Output | Select-Object -First 1 } function Get-PulumiVersion { From 5282793d8b9fa6a52ca4acbc995f86f6a39634a8 Mon Sep 17 00:00:00 2001 From: Hutson Betts Date: Wed, 7 Oct 2020 23:11:54 -0500 Subject: [PATCH 19/27] refactor(windows): consistent file naming Use the same file naming scheme for Windows as is used for Ubuntu, where the file name includes the Operating System name and release, but not the target platform. This also encourages downstream consumers to re-use the same files with alternative targets by extending the `builders` section and using the `-only` command line option with Packer to specify the build target. Closes #1636 --- helpers/GenerateResourcesAndImage.ps1 | 4 ++-- images.CI/linux-and-win/azure-pipelines/windows2016.yml | 2 +- images.CI/linux-and-win/azure-pipelines/windows2019.yml | 2 +- images/win/{Windows2016-Azure.json => windows2016.json} | 0 images/win/{Windows2019-Azure.json => windows2019.json} | 0 5 files changed, 4 insertions(+), 4 deletions(-) rename images/win/{Windows2016-Azure.json => windows2016.json} (100%) rename images/win/{Windows2019-Azure.json => windows2019.json} (100%) diff --git a/helpers/GenerateResourcesAndImage.ps1 b/helpers/GenerateResourcesAndImage.ps1 index 9718bc35a..57c4675d2 100644 --- a/helpers/GenerateResourcesAndImage.ps1 +++ b/helpers/GenerateResourcesAndImage.ps1 @@ -20,10 +20,10 @@ Function Get-PackerTemplatePath { switch ($ImageType) { ([ImageType]::Windows2016) { - $relativePath = "\images\win\Windows2016-Azure.json" + $relativePath = "\images\win\windows2016.json" } ([ImageType]::Windows2019) { - $relativePath = "\images\win\Windows2019-Azure.json" + $relativePath = "\images\win\windows2019.json" } ([ImageType]::Ubuntu1604) { $relativePath = "\images\linux\ubuntu1604.json" diff --git a/images.CI/linux-and-win/azure-pipelines/windows2016.yml b/images.CI/linux-and-win/azure-pipelines/windows2016.yml index 39d013f99..0220a38f2 100644 --- a/images.CI/linux-and-win/azure-pipelines/windows2016.yml +++ b/images.CI/linux-and-win/azure-pipelines/windows2016.yml @@ -16,5 +16,5 @@ pr: jobs: - template: image-generation.yml parameters: - image_type: Windows2016-Azure + image_type: windows2016 image_readme_name: Windows2016-Readme.md \ No newline at end of file diff --git a/images.CI/linux-and-win/azure-pipelines/windows2019.yml b/images.CI/linux-and-win/azure-pipelines/windows2019.yml index 01f65c0ec..ccad8f882 100644 --- a/images.CI/linux-and-win/azure-pipelines/windows2019.yml +++ b/images.CI/linux-and-win/azure-pipelines/windows2019.yml @@ -16,5 +16,5 @@ pr: jobs: - template: image-generation.yml parameters: - image_type: Windows2019-Azure + image_type: windows2019 image_readme_name: Windows2019-Readme.md \ No newline at end of file diff --git a/images/win/Windows2016-Azure.json b/images/win/windows2016.json similarity index 100% rename from images/win/Windows2016-Azure.json rename to images/win/windows2016.json diff --git a/images/win/Windows2019-Azure.json b/images/win/windows2019.json similarity index 100% rename from images/win/Windows2019-Azure.json rename to images/win/windows2019.json From 07b825bf7c94d007a980d3cb375e786aaa549087 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2020 04:41:38 +0000 Subject: [PATCH 20/27] Ubuntu 2004 (20201004 update) (#1729) * Updating readme file for ubuntu20 version 20201004.1 * fix erlang version Co-authored-by: Image generation service account Co-authored-by: AlyonaSviridenko Co-authored-by: Actions service account --- images/linux/Ubuntu2004-README.md | 84 ++++++++++++++++--------------- 1 file changed, 44 insertions(+), 40 deletions(-) diff --git a/images/linux/Ubuntu2004-README.md b/images/linux/Ubuntu2004-README.md index 2776b988a..4a59e7ca9 100644 --- a/images/linux/Ubuntu2004-README.md +++ b/images/linux/Ubuntu2004-README.md @@ -1,34 +1,34 @@ -| Announcements | -|-| -| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) | +| Announcements | +|-| +| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) | | [Clang/LLVM 10 will be set as a default one and Clang/LLVM 6 will be deprecated for Ubuntu 20.04 on September, 23](https://github.com/actions/virtual-environments/issues/1536) | *** # Ubuntu 20.04.1 LTS -- Image Version: 20200920.1 +- Image Version: 20201004.1 ## Installed Software ### Language and Runtime -- GNU C++ 7.5.0, 8.4.0, 9.3.0 +- GNU C++ 7.5.0, 8.4.0, 9.3.0, 10.0.1 - GNU Fortran 8.4.0, 9.3.0 -- Clang 10.0.1, 8.0.1, 9.0.1 -- Erlang 11.0.3 +- Clang 8.0.1, 9.0.1, 10.0.0 +- Erlang 11.1 - Mono 6.12.0.90 - Node 12.18.4 -- Python 2.7.18rc1 +- Python 3.8.2 - Python3 3.8.2 - PowerShell 7.0.3 - Ruby 2.7.0p0 - Swift 5.3 -- Julia 1.5.1 +- Julia 1.5.2 ### Package Management -- Homebrew 2.5.1 +- Homebrew 2.5.2 - Gem 3.1.2 - Miniconda 4.8.3 -- Helm 3.3.3 +- Helm 3.3.4 - Npm 6.14.8 - Yarn 1.22.5 -- Pip 20.2.3 +- Pip 20.0.2 - Pip3 20.0.2 - Vcpkg 2020.06.15 @@ -43,21 +43,22 @@ - Ansible 2.9.6 - AzCopy10 10.6.0 (available by `azcopy10` alias) - AzCopy7 7.3.0 (available by `azcopy` alias) -- Bazel 3.5.0 +- Bazel 3.5.1 - Bazelisk 1.6.1 -- Buildah 1.16.1 +- Buildah 1.16.4 - CMake 3.17.0 +- CodeQL Action Bundle 2.2.5 - curl 7.68.0 -- Docker Compose 1.27.3 +- Docker Compose 1.27.4 - Docker-Buildx 0.4.2 -- Docker-Moby 19.03.12 +- Docker-Moby 19.03.13 - Git 2.28.0 - Git LFS 2.12.0 - Git-ftp 1.6.0 -- Google Cloud SDK 310.0.0 +- Google Cloud SDK 312.0.0 - Haveged 1.9.1 -- Heroku 7.43.0 -- HHVM (HipHop VM) 4.75.0 +- Heroku 7.44.0 +- HHVM (HipHop VM) 4.77.0 - jq 1.6 - Kind 0.9.0 - Kubectl 1.19.2 @@ -65,16 +66,19 @@ - Leiningen 2.9.4 - m4 1.4.18 - Mercurial 5.3.1 -- Minikube 1.13.0 +- Minikube 1.13.1 - Newman 5.2.0 - nvm 0.35.3 -- Packer 1.6.2 +- Packer 1.6.4 - PhantomJS 2.1.1 -- Podman 2.0.6 -- Skopeo 1.1.1 +- Podman 2.1.1 +- Pulumi 2.11.2 +- R 4.0.2 +- Skopeo 1.2.0 +- Sphinx Open Source Search Server 2.2.11 - SVN 1.13.0 - Swig 4.0.1 -- Terraform 0.13.3 +- Terraform 0.13.4 - unzip 6.00 - wget 1.20.3 - zip 3.0 @@ -82,17 +86,17 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.59 -- AWS CLI 2.0.50 +- AWS CLI 2.0.54 - AWS CLI Session manager plugin 1.1.61.0 -- AWS SAM CLI 1.2.0 -- Azure CLI (azure-cli) 2.11.1 +- AWS SAM CLI 1.4.0 +- Azure CLI (azure-cli) 2.12.1 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI 1.0.0 - Hub CLI 2.14.2 -- Netlify CLI 2.63.2 +- Netlify CLI 2.64.1 - oc CLI 4.5.0 - ORAS CLI 0.8.1 -- Vercel CLI 20.1.0 +- Vercel CLI 20.1.1 ### Java | Version | Vendor | Environment Variable | @@ -120,26 +124,26 @@ #### Packages - Bindgen 0.55.1 -- Cargo audit 0.12.0 +- Cargo audit 0.12.1 - Cargo outdated 0.9.11 - Cargo clippy 0.0.212 -- Cbindgen 0.14.5 +- Cbindgen 0.14.6 - Rustfmt 1.4.18 ### Browsers and Drivers -- Google Chrome 85.0.4183.102 +- Google Chrome 85.0.4183.121 - ChromeDriver 85.0.4183.87 -- Mozilla Firefox 80.0.1 +- Mozilla Firefox 81.0 - Geckodriver 0.27.0 ### .NET Core SDK - 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.508 2.1.509 2.1.510 2.1.511 2.1.512 2.1.513 2.1.514 2.1.515 2.1.516 2.1.517 2.1.518 2.1.602 2.1.603 2.1.604 2.1.605 2.1.606 2.1.607 2.1.608 2.1.609 2.1.610 2.1.611 2.1.612 2.1.613 2.1.614 2.1.615 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 ### Az Module -- 4.6.1 +- 4.7.0 ### Databases -- Postgre SQL 12.4 +- Postgre SQL 13.0 - MongoDB 4.4.1 - sqlite3 3.31.1 @@ -162,17 +166,17 @@ - 3.5.10 - 3.6.12 - 3.7.9 -- 3.8.5 +- 3.8.6 #### PyPy -- 2.7.13 [PyPy 7.3.1] -- 3.6.9 [PyPy 7.3.1] +- 2.7.13 [PyPy 7.3.2] +- 3.6.9 [PyPy 7.3.2] #### Node.js - 8.17.0 - 10.22.1 - 12.18.4 -- 14.11.0 +- 14.13.0 #### Go - 1.14.9 @@ -210,6 +214,6 @@ - ubuntu:14.04 ### Installed apt packages -- bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgtk-3-0, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, python-is-python2, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync +- bison, brotli, bzip2, curl, dbus, dnsutils, dpkg, fakeroot, file, flex, ftp, gnupg2, iproute2, iputils-ping, jq, lib32z1, libc++-dev, libc++abi-dev, libcurl4, libgbm-dev, libgconf-2-4, libgtk-3-0, libsecret-1-dev, libsqlite3-dev, libunwind8, libxkbfile-dev, libxss1, locales, m4, netcat, openssh-client, parallel, patchelf, pkg-config, python-is-python3, rpm, rsync, shellcheck, sqlite3, ssh, sudo, telnet, texinfo, time, tk, tzdata, unzip, upx, wget, xorriso, xvfb, xz-utils, yamllint, zip, zstd, zsync From 5c26e32b91bf6fa74f033c8cf3774a90d1785018 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2020 09:15:48 +0000 Subject: [PATCH 21/27] Ubuntu 1604 (20201004 update) (#1727) * Updating readme file for ubuntu16 version 20201004.1 * fix erlang version Co-authored-by: Image generation service account Co-authored-by: AlyonaSviridenko Co-authored-by: Actions service account --- images/linux/Ubuntu1604-README.md | 64 ++++++++++++++++--------------- 1 file changed, 34 insertions(+), 30 deletions(-) diff --git a/images/linux/Ubuntu1604-README.md b/images/linux/Ubuntu1604-README.md index be5b36b92..5e3c8ef26 100644 --- a/images/linux/Ubuntu1604-README.md +++ b/images/linux/Ubuntu1604-README.md @@ -1,17 +1,17 @@ -| Announcements | -|-| -| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) | +| Announcements | +|-| +| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) | | [Clang/LLVM 10 will be set as a default one and Clang/LLVM 6 will be deprecated for Ubuntu 20.04 on September, 23](https://github.com/actions/virtual-environments/issues/1536) | *** # Ubuntu 16.04.7 LTS -- Image Version: 20200920.1 +- Image Version: 20201004.1 ## Installed Software ### Language and Runtime - GNU C++ 5.5.0, 7.5.0, 8.4.0, 9.3.0 - GNU Fortran 5.5.0, 8.4.0, 9.3.0 - Clang 6.0.0, 8.0.0, 9.0.1 -- Erlang 11.0.3 +- Erlang 11.1 - Mono 6.12.0.90 - Node 12.18.4 - Python 2.7.12 @@ -19,10 +19,10 @@ - PowerShell 7.0.3 - Ruby 2.3.1p112 - Swift 5.3 -- Julia 1.5.1 +- Julia 1.5.2 ### Package Management -- Homebrew 2.5.1 +- Homebrew 2.5.2 - Gem 3.1.4 - Miniconda 4.8.3 - Helm @@ -43,19 +43,20 @@ - Ansible 2.9.13 - AzCopy10 10.6.0 (available by `azcopy10` alias) - AzCopy7 7.3.0 (available by `azcopy` alias) -- Bazel 3.5.0 +- Bazel 3.5.1 - Bazelisk 1.6.1 - CMake 3.17.0 +- CodeQL Action Bundle 2.2.5 - curl 7.47.0 -- Docker Compose 1.27.3 +- Docker Compose 1.27.4 - Docker-Buildx 0.4.2 -- Docker-Moby 19.03.12 +- Docker-Moby 19.03.13 - Git 2.28.0 - Git LFS 2.12.0 - Git-ftp 1.0.2 -- Google Cloud SDK 310.0.0 +- Google Cloud SDK 312.0.0 - Haveged 1.9.1 -- Heroku 7.43.0 +- Heroku 7.44.0 - HHVM (HipHop VM) 4.56.1 - jq 1.5 - Kind 0.9.0 @@ -64,14 +65,17 @@ - Leiningen 2.9.4 - m4 1.4.17 - Mercurial 4.4.1 -- Minikube 1.13.0 +- Minikube 1.13.1 - Newman 5.2.0 - nvm 0.35.3 -- Packer 1.6.2 +- Packer 1.6.4 - PhantomJS 2.1.1 +- Pulumi 2.11.2 +- R 4.0.2 +- Sphinx Open Source Search Server 2.2.9 - SVN 1.9.3 - Swig 3.0.8 -- Terraform 0.13.3 +- Terraform 0.13.4 - unzip 6.00 - wget 1.17.1 - zip 3.0 @@ -79,17 +83,17 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.59 -- AWS CLI 1.18.142 +- AWS CLI 1.18.152 - AWS CLI Session manager plugin 1.1.61.0 -- AWS SAM CLI 1.2.0 -- Azure CLI (azure-cli) 2.11.1 +- AWS SAM CLI 1.4.0 +- Azure CLI (azure-cli) 2.12.1 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI - Hub CLI 2.14.2 -- Netlify CLI 2.63.2 +- Netlify CLI 2.64.1 - oc CLI 4.5.0 - ORAS CLI 0.8.1 -- Vercel CLI 20.1.0 +- Vercel CLI 20.1.1 ### Java | Version | Vendor | Environment Variable | @@ -119,26 +123,26 @@ #### Packages - Bindgen 0.55.1 -- Cargo audit 0.12.0 +- Cargo audit 0.12.1 - Cargo outdated 0.9.11 - Cargo clippy 0.0.212 -- Cbindgen 0.14.5 +- Cbindgen 0.14.6 - Rustfmt 1.4.18 ### Browsers and Drivers -- Google Chrome 85.0.4183.102 +- Google Chrome 85.0.4183.121 - ChromeDriver 85.0.4183.87 -- Mozilla Firefox 80.0.1 +- Mozilla Firefox 81.0 - Geckodriver 0.27.0 ### .NET Core SDK - 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.508 2.1.509 2.1.510 2.1.511 2.1.512 2.1.513 2.1.514 2.1.515 2.1.516 2.1.517 2.1.518 2.1.602 2.1.603 2.1.604 2.1.605 2.1.606 2.1.607 2.1.608 2.1.609 2.1.610 2.1.611 2.1.612 2.1.613 2.1.614 2.1.615 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 ### Az Module -- 1.0.0 1.6.0 2.3.2 2.6.0 2.8.0 3.1.0 3.5.0 3.8.0 4.3.0 4.4.0 4.6.0 +- 1.0.0 1.6.0 2.3.2 2.6.0 2.8.0 3.1.0 3.5.0 3.8.0 4.3.0 4.4.0 4.6.0 4.7.0 ### Databases -- Postgre SQL 12.4 +- Postgre SQL 13.0 - MongoDB 4.4.1 - sqlite3 3.11.0 @@ -162,17 +166,17 @@ - 3.5.10 - 3.6.12 - 3.7.9 -- 3.8.5 +- 3.8.6 #### PyPy -- 2.7.13 [PyPy 7.3.1] -- 3.6.9 [PyPy 7.3.1] +- 2.7.13 [PyPy 7.3.2] +- 3.6.9 [PyPy 7.3.2] #### Node.js - 8.17.0 - 10.22.1 - 12.18.4 -- 14.11.0 +- 14.13.0 #### Go - 1.11.13 From 124b841acadf62b4e5db5486a5bfca9126cf06f9 Mon Sep 17 00:00:00 2001 From: Alena Sviridenko Date: Thu, 8 Oct 2020 12:27:44 +0300 Subject: [PATCH 22/27] updated triage rules (#1766) --- .github/workflows/issue-triager.yml | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/issue-triager.yml b/.github/workflows/issue-triager.yml index 12d04db5a..c7f4b9f88 100644 --- a/.github/workflows/issue-triager.yml +++ b/.github/workflows/issue-triager.yml @@ -24,9 +24,21 @@ jobs: with: github-token: ${{secrets.GITHUB_TOKEN}} script: | - github.issues.addLabels({ + const issueLabels = await github.issues.listLabelsOnIssue({ issue_number: context.issue.number, owner: context.repo.owner, - repo: context.repo.repo, - labels: ['needs triage'] - }) \ No newline at end of file + repo: context.repo.repo + }); + + const isAnnouncement = issueLabels.data && issueLabels.data + .map(label => label.name) + .includes('announcement'); + + if (!isAnnouncement) { + github.issues.addLabels({ + issue_number: context.issue.number, + owner: context.repo.owner, + repo: context.repo.repo, + labels: ['needs triage'] + }) + } \ No newline at end of file From 0a35359f4b9caec4fb0a7777b2a1ffbdb47e4f2d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2020 11:50:43 +0000 Subject: [PATCH 23/27] Ubuntu 1804 (20201004 update) (#1728) * Updating readme file for ubuntu18 version 20201004.1 * fixed erlang output * restore initial version * Revert "restore initial version" This reverts commit 089a6f2ca93146926455040e1a7438a02a685100. * Revert "fixed erlang output" This reverts commit e8ddae5ace2d7b79e04385bc314c7964f923e599. * fix erlang version Co-authored-by: Image generation service account Co-authored-by: Alena Sviridenko Co-authored-by: Actions service account --- images/linux/Ubuntu1804-README.md | 70 ++++++++++++++++--------------- 1 file changed, 37 insertions(+), 33 deletions(-) diff --git a/images/linux/Ubuntu1804-README.md b/images/linux/Ubuntu1804-README.md index f72a52ca0..da48be720 100644 --- a/images/linux/Ubuntu1804-README.md +++ b/images/linux/Ubuntu1804-README.md @@ -1,17 +1,17 @@ -| Announcements | -|-| -| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) | +| Announcements | +|-| +| [Default Python will be switched to 3.8 on Ubuntu 20.04 on October, 6](https://github.com/actions/virtual-environments/issues/1591) | | [Clang/LLVM 10 will be set as a default one and Clang/LLVM 6 will be deprecated for Ubuntu 20.04 on September, 23](https://github.com/actions/virtual-environments/issues/1536) | *** # Ubuntu 18.04.5 LTS -- Image Version: 20200920.1 +- Image Version: 20201004.1 ## Installed Software ### Language and Runtime -- GNU C++ 7.5.0, 8.4.0, 9.3.0 +- GNU C++ 7.5.0, 8.4.0, 9.3.0, 10.1.0 - GNU Fortran 7.5.0, 8.4.0, 9.3.0 - Clang 6.0.0, 8.0.0, 9.0.0 -- Erlang 11.0.3 +- Erlang 11.1 - Mono 6.12.0.90 - Node 12.18.4 - Python 2.7.17 @@ -19,10 +19,10 @@ - PowerShell 7.0.3 - Ruby 2.5.1p57 - Swift 5.3 -- Julia 1.5.1 +- Julia 1.5.2 ### Package Management -- Homebrew 2.5.1 +- Homebrew 2.5.2 - Gem 3.1.4 - Miniconda 4.8.3 - Helm @@ -43,21 +43,22 @@ - Ansible 2.9.13 - AzCopy10 10.6.0 (available by `azcopy10` alias) - AzCopy7 7.3.0 (available by `azcopy` alias) -- Bazel 3.5.0 +- Bazel 3.5.1 - Bazelisk 1.6.1 - Buildah - CMake 3.17.0 +- CodeQL Action Bundle 2.2.5 - curl 7.58.0 -- Docker Compose 1.27.3 +- Docker Compose 1.27.4 - Docker-Buildx 0.4.2 -- Docker-Moby 19.03.12 +- Docker-Moby 19.03.13 - Git 2.28.0 - Git LFS 2.12.0 - Git-ftp 1.3.1 -- Google Cloud SDK 310.0.0 +- Google Cloud SDK 312.0.0 - Haveged 1.9.1 -- Heroku 7.43.0 -- HHVM (HipHop VM) 4.75.0 +- Heroku 7.44.0 +- HHVM (HipHop VM) 4.77.0 - jq 1.5 - Kind 0.9.0 - Kubectl 1.19.2 @@ -65,16 +66,19 @@ - Leiningen 2.9.4 - m4 1.4.18 - Mercurial 4.5.3 -- Minikube 1.13.0 +- Minikube 1.13.1 - Newman 5.2.0 - nvm 0.35.3 -- Packer 1.6.2 +- Packer 1.6.4 - PhantomJS 2.1.1 - Podman -- Skopeo 1.1.1 +- Pulumi 2.11.2 +- R 4.0.2 +- Skopeo 1.2.0 +- Sphinx Open Source Search Server 2.2.11 - SVN 1.9.7 - Swig 3.0.12 -- Terraform 0.13.3 +- Terraform 0.13.4 - unzip 6.00 - wget 1.19.4 - zip 3.0 @@ -82,17 +86,17 @@ ### CLI Tools - Alibaba Cloud CLI 3.0.59 -- AWS CLI 1.18.142 +- AWS CLI 1.18.152 - AWS CLI Session manager plugin 1.1.61.0 -- AWS SAM CLI 1.2.0 -- Azure CLI (azure-cli) 2.11.1 +- AWS SAM CLI 1.4.0 +- Azure CLI (azure-cli) 2.12.1 - Azure CLI (azure-devops) 0.18.0 - GitHub CLI - Hub CLI 2.14.2 -- Netlify CLI 2.63.2 +- Netlify CLI 2.64.1 - oc CLI 4.5.0 - ORAS CLI 0.8.1 -- Vercel CLI 20.1.0 +- Vercel CLI 20.1.1 ### Java | Version | Vendor | Environment Variable | @@ -122,26 +126,26 @@ #### Packages - Bindgen 0.55.1 -- Cargo audit 0.12.0 +- Cargo audit 0.12.1 - Cargo outdated 0.9.11 - Cargo clippy 0.0.212 -- Cbindgen 0.14.5 +- Cbindgen 0.14.6 - Rustfmt 1.4.18 ### Browsers and Drivers -- Google Chrome 85.0.4183.102 +- Google Chrome 85.0.4183.121 - ChromeDriver 85.0.4183.87 -- Mozilla Firefox 80.0.1 +- Mozilla Firefox 81.0 - Geckodriver 0.27.0 ### .NET Core SDK - 2.1.300 2.1.301 2.1.302 2.1.401 2.1.402 2.1.403 2.1.500 2.1.502 2.1.503 2.1.504 2.1.505 2.1.506 2.1.507 2.1.508 2.1.509 2.1.510 2.1.511 2.1.512 2.1.513 2.1.514 2.1.515 2.1.516 2.1.517 2.1.518 2.1.602 2.1.603 2.1.604 2.1.605 2.1.606 2.1.607 2.1.608 2.1.609 2.1.610 2.1.611 2.1.612 2.1.613 2.1.614 2.1.615 2.1.700 2.1.701 2.1.801 2.1.802 2.1.803 2.1.804 2.1.805 2.1.806 2.1.807 2.1.808 2.1.809 2.1.810 3.0.100 3.0.101 3.0.102 3.0.103 3.1.100 3.1.101 3.1.102 3.1.103 3.1.104 3.1.105 3.1.106 3.1.107 3.1.108 3.1.200 3.1.201 3.1.202 3.1.300 3.1.301 3.1.302 3.1.401 3.1.402 ### Az Module -- 1.0.0 1.6.0 2.3.2 2.6.0 2.8.0 3.1.0 3.5.0 3.8.0 4.3.0 4.4.0 4.6.0 +- 1.0.0 1.6.0 2.3.2 2.6.0 2.8.0 3.1.0 3.5.0 3.8.0 4.3.0 4.4.0 4.6.0 4.7.0 ### Databases -- Postgre SQL 12.4 +- Postgre SQL 13.0 - MongoDB 4.4.1 - sqlite3 3.22.0 @@ -165,17 +169,17 @@ - 3.5.10 - 3.6.12 - 3.7.9 -- 3.8.5 +- 3.8.6 #### PyPy -- 2.7.13 [PyPy 7.3.1] -- 3.6.9 [PyPy 7.3.1] +- 2.7.13 [PyPy 7.3.2] +- 3.6.9 [PyPy 7.3.2] #### Node.js - 8.17.0 - 10.22.1 - 12.18.4 -- 14.11.0 +- 14.13.0 #### Go - 1.11.13 From cb16dfc17427f300f2ff3bf702df629116ffe441 Mon Sep 17 00:00:00 2001 From: Aleksandr Chebotov <47745270+al-cheb@users.noreply.github.com> Date: Thu, 8 Oct 2020 15:27:39 +0300 Subject: [PATCH 24/27] [images.CI] Delete macOS VMs on build canceling (#1742) * destroy vm * destroy vm * check clone status * fix vm state * remove exit 1 * fix params * suppress stop-vm output * replace or -> Or * rename doc terms --- .../azure-pipelines/image-generation.yml | 11 +++ images.CI/macos/destroy-vm.ps1 | 89 +++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 images.CI/macos/destroy-vm.ps1 diff --git a/images.CI/macos/azure-pipelines/image-generation.yml b/images.CI/macos/azure-pipelines/image-generation.yml index 7f02d90f9..b70e42158 100644 --- a/images.CI/macos/azure-pipelines/image-generation.yml +++ b/images.CI/macos/azure-pipelines/image-generation.yml @@ -105,3 +105,14 @@ jobs: failTaskOnFailedTests: true displayName: Publish test results condition: always() + + - task: PowerShell@2 + displayName: 'Destroy VM (if build canceled only)' + condition: eq(variables['Agent.JobStatus'], 'Canceled') + inputs: + targetType: 'filePath' + filePath: ./images.CI/macos/destroy-vm.ps1 + arguments: -VMName "${{ variables.VirtualMachineName }}" ` + -VIServer "$(vcenter-server-v2)" ` + -VIUserName "$(vcenter-username-v2)" ` + -VIPassword "$(vcenter-password-v2)" diff --git a/images.CI/macos/destroy-vm.ps1 b/images.CI/macos/destroy-vm.ps1 new file mode 100644 index 000000000..0b8083703 --- /dev/null +++ b/images.CI/macos/destroy-vm.ps1 @@ -0,0 +1,89 @@ +[CmdletBinding()] +param( + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string]$VMName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string]$VIServer, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string]$VIUserName, + + [Parameter(Mandatory)] + [ValidateNotNullOrEmpty()] + [string]$VIPassword +) + +$ProgressPreference = "SilentlyContinue" +$WarningPreference = "SilentlyContinue" + +# connection to a vCenter Server system +try +{ + $null = Set-PowerCLIConfiguration -Scope Session -InvalidCertificateAction Ignore -ParticipateInCEIP $false -Confirm:$false -WebOperationTimeoutSeconds 600 + $securePassword = ConvertTo-SecureString -String $VIPassword -AsPlainText -Force + $cred = New-Object System.Management.Automation.PSCredential($VIUserName, $securePassword) + $null = Connect-VIServer -Server $VIServer -Credential $cred -ErrorAction Stop + Write-Host "Connection to the vSphere server has been established" +} +catch +{ + Write-Host "##vso[task.LogIssue type=error;]Failed to connect to the vSphere server" + exit 1 +} + +# check vm clone status +$chainId = (Get-VIEvent -Entity $VMName).ChainId +if ($chainId) +{ + $task = Get-Task -Status Running | Where-Object { ($_.Name -eq 'CloneVM_Task') -and ($_.ExtensionData.Info.EventChainId -in $chainId) } + if ($task) + { + try + { + Stop-Task -Task $task -Confirm:$false -ErrorAction Stop + Write-Host "The vm '$VMName' clone task has been cancelled" + } + catch + { + Write-Host "##vso[task.LogIssue type=error;]Failed to cancel the task" + } + } +} + +# remove a vm +$vm = Get-VM -Name $VMName -ErrorAction SilentlyContinue + +if ($vm) +{ + $vmState = $vm.PowerState + if ($vmState -ne "PoweredOff") + { + try + { + $null = Stop-VM -VM $vm -Confirm:$false -ErrorAction Stop + Write-Host "The vm '$VMName' has been powered off" + } + catch + { + Write-Host "##vso[task.LogIssue type=error;]Failed to shutdown '$VMName'" + } + } + + try + { + Remove-VM -VM $vm -DeletePermanently -Confirm:$false -ErrorAction Stop + Write-Host "The vm '$VMName' has been removed" + } + catch + { + Write-Host "##vso[task.LogIssue type=error;]Failed to remove '$VMName'" + } +} +else +{ + Write-Host "VM '$VMName' not found" +} \ No newline at end of file From a30fb6b0417f4ccc3fa4291468b228b1e8b04f68 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 8 Oct 2020 15:10:46 +0000 Subject: [PATCH 25/27] Updating readme file for win19 version 20201004.1 (#1730) Co-authored-by: Image generation service account Co-authored-by: Actions service account --- images/win/Windows2019-Readme.md | 192 +++++++++++-------------------- 1 file changed, 70 insertions(+), 122 deletions(-) diff --git a/images/win/Windows2019-Readme.md b/images/win/Windows2019-Readme.md index 50f161d2b..c3a83a660 100644 --- a/images/win/Windows2019-Readme.md +++ b/images/win/Windows2019-Readme.md @@ -4,7 +4,7 @@ *** # Microsoft Windows Server 2019 Datacenter - OS Version: 10.0.17763 Build 1457 -- Image Version: 20200920.1 +- Image Version: 20201004.1 ## Enabled windows optional features - Windows Subsystem for Linux @@ -18,8 +18,8 @@ - Python 3.7.9 - Ruby 2.5.8p224 - Go 1.14.9 -- PHP 7.4.9 -- Julia 1.5.1 +- PHP 7.4.11 +- Julia 1.5.2 - Perl 5.32.0 - Node 12.18.4 @@ -27,16 +27,16 @@ - Chocolatey 0.10.15 - Vcpkg 2020.06.15 - NPM 6.14.6 -- Yarn 1.22.5 +- Yarn 1.22.10 - pip 20.2.3 (python 3.7) - Miniconda 4.6.14 - RubyGems 3.1.4 -- Helm 3.3.3 +- Helm 3.3.4 - Composer 1.10.13 - NuGet 5.7.0.6726 ### Project Management -- Ant 1.10.8 +- Ant 1.10.9 - Maven 3.6.3 - Gradle 6.6 - sbt 1.3.13 @@ -44,15 +44,16 @@ ### Tools - Azure CosmosDb Emulator 2.11.5.0 - azcopy 10.6.0 -- Bazel 3.5.0 +- Bazel 3.5.1 - Bazelisk 1.6.1 -- CMake 3.18.2 +- CMake 3.18.3 +- CodeQL Action Bundle 2.2.5 - R 4.0.2 - Docker 19.03.12 - Docker-compose 1.27.2 - Git 2.28.0 - Git LFS 2.11.0 -- Google Cloud SDK 310.0.0 +- Google Cloud SDK 312.0.0 - InnoSetup 6.0.5 - jq 1.6 - Kubectl 1.19.1 @@ -63,10 +64,10 @@ - NSIS v3.06.1 - Newman 5.2.0 - OpenSSL 1.1.1 -- Packer 1.6.2 -- Pulumi v2.10.1 +- Packer 1.6.3 +- Pulumi v2.11.2 - SQLPS 1.0 -- SQLServer PS 21.1.18226 +- SQLServer PS 21.1.18228 - Subversion (SVN) 1.14.0 - ghc 8.10.2 - Cabal 3.2.0.0 @@ -75,16 +76,17 @@ - zstd 1.4.5 - VSWhere 2.8.4 - 7zip 19.00 -- yamllint 1.24.2 +- yamllint 1.25.0 ### CLI Tools -- Azure CLI 2.11.1 +- Azure CLI 2.12.1 - Azure DevOps CLI extension 0.18.0 -- AWS CLI 2.0.50 -- AWS SAM CLI 1.2.0 +- Azure Dev Spaces CLI 1.0.20200921.3 +- AWS CLI 2.0.54 +- AWS SAM CLI 1.4.0 - AWS Session Manager CLI 1.1.61.0 - Alibaba Cloud CLI 3.0.59 -- Cloud Foundry CLI 6.52.0 +- Cloud Foundry CLI 6.53.0 - Hub CLI 2.14.2 - GitHub CLI 1.0.0 @@ -93,16 +95,16 @@ #### Packages - bindgen 0.55.1 -- cbindgen 0.14.5 -- cargo-audit 0.12.0 +- cbindgen 0.14.6 +- cargo-audit 0.12.1 - cargo-outdated v0.9.11 ### Browsers and webdrivers -- Google Chrome 85.0.4183.102 +- Google Chrome 85.0.4183.121 - Chrome Driver 85.0.4183.87 -- Microsoft Edge 85.0.564.51 -- Microsoft Edge Driver 85.0.564.51 -- Mozilla Firefox 80.0.1 +- Microsoft Edge 85.0.564.68 +- Microsoft Edge Driver 85.0.564.68 +- Mozilla Firefox 81.0.1 - Gecko Driver 0.27.0 - IE Driver 3.150.1.0 @@ -152,7 +154,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 8.17.0 | x64 | | 10.22.1 | x64 | | 12.18.4 | x64 | -| 14.11.0 | x64 | +| 14.13.0 | x64 | #### Python @@ -162,7 +164,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | 3.5.4 | x64, x86 | | 3.6.8 | x64, x86 | | 3.7.9 (Default) | x64, x86 | -| 3.8.5 | x64, x86 | +| 3.8.6 | x64, x86 | #### Ruby @@ -177,8 +179,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PyPy | Python Version | Architecture | PyPy Version | | -------------- | ------------ | ------------ | -| 2.7.13 | x86 | PyPy 7.3.1 with MSC v.1912 32 bit | -| 3.6.9 | x86 | PyPy 7.3.1 with MSC v.1912 32 bit | +| 2.7.13 | x86 | PyPy 7.3.2 with MSC v.1927 32 bit | +| 3.6.9 | x86 | PyPy 7.3.2 with MSC v.1927 32 bit | @@ -186,12 +188,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. #### PostgreSQL | Property | Value | | -------------------- | ------------------------------------------------------------------------------------------------------------------------------------ | -| ServiceName | postgresql-x64-12 | -| Version | 12.4 | +| ServiceName | postgresql-x64-13 | +| Version | 13.0 | | ServiceStatus | Stopped | | ServiceStartType | Disabled | -| EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\12\bin
PGDATA=C:\Program Files\PostgreSQL\12\data
PGROOT=C:\Program Files\PostgreSQL\12 | -| Path | C:\Program Files\PostgreSQL\12 | +| EnvironmentVariables | PGBIN=C:\Program Files\PostgreSQL\13\bin
PGDATA=C:\Program Files\PostgreSQL\13\data
PGROOT=C:\Program Files\PostgreSQL\13 | +| Path | C:\Program Files\PostgreSQL\13 | | UserName | postgres | | Password | root | @@ -206,13 +208,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH. ### Visual Studio Enterprise 2019 | Name | Version | Path | | ----------------------------- | -------------- | -------------------------------------------------------------- | -| Visual Studio Enterprise 2019 | 16.7.30503.244 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | +| Visual Studio Enterprise 2019 | 16.7.30523.141 | C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise | #### Workloads, components and extensions: | Package | Version | | ------------------------------------------------------------------------- | -------------- | -| Component.Android.NDK.R16B | 16.7.30427.251 | +| Component.Android.NDK.R16B | 16.7.30521.138 | | Component.Android.SDK25.Private | 16.0.28625.61 | | Component.Android.SDK28 | 16.2.29003.222 | | Component.Ant | 1.9.3.8 | @@ -427,7 +429,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft.VisualStudio.Workload.Universal | 16.7.30310.162 | | Microsoft.VisualStudio.Workload.VisualStudioExtension | 16.4.29409.204 | | SSDT Microsoft Analysis Services Projects | 2.9.13 | -| SSDT SQL Server Integration Services Projects | 3.9 | +| SSDT SQL Server Integration Services Projects | 3.10 | | SSDT Microsoft Reporting Services Projects | 2.6.7 | | Windows Driver Kit | 3.11.4516 | | Windows Driver Kit Visual Studio Extension | 10.1.19041.1 | @@ -446,12 +448,12 @@ Note: MSYS2 is pre-installed on image but not added to PATH. | Microsoft Visual C++ 2013 Minimum Runtime | x64 | 12.0.40660 | | Microsoft Visual C++ 2013 Additional Runtime | x86 | 12.0.21005 | | Microsoft Visual C++ 2013 Minimum Runtime | x86 | 12.0.21005 | -| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.27.29016 | -| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.27.29016 | -| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.27.29016 | -| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.27.29016 | -| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.27.29016 | -| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.27.29016 | +| Microsoft Visual C++ 2019 Additional Runtime | x64 | 14.27.29112 | +| Microsoft Visual C++ 2019 Debug Runtime | x64 | 14.27.29112 | +| Microsoft Visual C++ 2019 Minimum Runtime | x64 | 14.27.29112 | +| Microsoft Visual C++ 2019 Additional Runtime | x86 | 14.27.29112 | +| Microsoft Visual C++ 2019 Debug Runtime | x86 | 14.27.29112 | +| Microsoft Visual C++ 2019 Minimum Runtime | x86 | 14.27.29112 | ### .NET Core SDK `Location C:\Program Files\dotnet\sdk` @@ -479,95 +481,41 @@ Note: MSYS2 is pre-installed on image but not added to PATH. - PowerShell 7.0.3 #### Azure Powershell Modules -| Module | Version | Path | -| ------- | -------------------------------------------------------------------------------------- | ------------------------------ | -| Az | 1.0.0
1.6.0
2.3.2
2.6.0
3.1.0
3.5.0
3.8.0
4.3.0
4.4.0
4.6.0 | C:\Modules\az_\ | -| Azure | 2.1.0 [Installed]
3.8.0
4.2.1
5.1.1
5.3.0 | C:\Modules\azure_\ | -| AzureRM | 2.1.0 [Installed]
3.8.0
4.2.1
5.1.1
6.7.0
6.13.1 | C:\Modules\azurerm_\ | +| Module | Version | Path | +| ------- | ----------------------------------------------------------------------------------------------- | ------------------------------ | +| Az | 1.0.0
1.6.0
2.3.2
2.6.0
3.1.0
3.5.0
3.8.0
4.3.0
4.4.0
4.6.0
4.7.0 | C:\Modules\az_\ | +| Azure | 2.1.0 [Installed]
3.8.0
4.2.1
5.1.1
5.3.0 | C:\Modules\azure_\ | +| AzureRM | 2.1.0 [Installed]
3.8.0
4.2.1
5.1.1
6.7.0
6.13.1 | C:\Modules\azurerm_\ | ``` Azure PowerShell module 2.1.0 and AzureRM PowerShell module 2.1.0 are installed and are available via 'Get-Module -ListAvailable'. All other versions are saved but not installed. ``` #### Powershell Modules -| Module | Version | -| ------------------ | ------------------ | -| DockerMsftProvider | 1.0.0.8 | -| MarkdownPS | 1.9 | -| Pester | 3.4.0
5.0.4 | -| PowerShellGet | 1.0.0.1
2.2.4.1 | -| PSWindowsUpdate | 2.2.0.2 | -| SqlServer | 21.1.18226 | -| VSSetup | 2.2.16 | +| Module | Version | +| ------------------ | --------------------------- | +| DockerMsftProvider | 1.0.0.8 | +| MarkdownPS | 1.9 | +| Pester | 3.4.0
5.0.4 | +| PowerShellGet | 1.0.0.1
2.2.4.1
2.2.5 | +| PSWindowsUpdate | 2.2.0.2 | +| SqlServer | 21.1.18228 | +| VSSetup | 2.2.16 | -### Android SDK Tools -| Package Name | Description | -| -------------- | ------------------------------------------- | -| platform-tools | Android SDK Platform-Tools, Revision 30.0.4 | -| tools | Android SDK Tools 26.1.1, Revision 26.1.1 | - -### Android SDK Platforms -`Location C:\Program Files (x86)\Android\android-sdk\platforms` -| Package Name | Description | -| ------------ | ------------------------------------------ | -| android-19 | Android SDK Platform 19, Revision 4 | -| android-21 | Android SDK Platform 21, Revision 2 | -| android-22 | Android SDK Platform 22, Revision 2 | -| android-23 | Android SDK Platform 23, Revision 3 | -| android-24 | Android SDK Platform 24, Revision 2 | -| android-25 | Android SDK Platform 25, Revision 3 | -| android-26 | Android SDK Platform 26, Revision 2 | -| android-27 | Android SDK Platform 27, Revision 3 | -| android-28 | Android SDK Platform 28, rev 6, Revision 6 | -| android-29 | Android SDK Platform 29, Revision 5 | -| android-30 | Android SDK Platform 30, Revision 3 | - -### Android SDK Build-Tools -`Location C:\Program Files (x86)\Android\android-sdk\build-tools` -| Package Name | Description | -| ------------------ | ---------------------------------------- | -| build-tools-19.1.0 | Android SDK Build-Tools, Revision 19.1.0 | -| build-tools-20.0.0 | Android SDK Build-Tools, Revision 20.0.0 | -| build-tools-21.1.2 | Android SDK Build-Tools, Revision 21.1.2 | -| build-tools-22.0.1 | Android SDK Build-Tools, Revision 22.0.1 | -| build-tools-23.0.1 | Android SDK Build-Tools, Revision 23.0.1 | -| build-tools-23.0.2 | Android SDK Build-Tools, Revision 23.0.2 | -| build-tools-23.0.3 | Android SDK Build-Tools, Revision 23.0.3 | -| build-tools-24.0.0 | Android SDK Build-Tools, Revision 24.0.0 | -| build-tools-24.0.1 | Android SDK Build-Tools, Revision 24.0.1 | -| build-tools-24.0.2 | Android SDK Build-Tools, Revision 24.0.2 | -| build-tools-24.0.3 | Android SDK Build-Tools, Revision 24.0.3 | -| build-tools-25.0.0 | Android SDK Build-Tools, Revision 25.0.0 | -| build-tools-25.0.1 | Android SDK Build-Tools, Revision 25.0.1 | -| build-tools-25.0.2 | Android SDK Build-Tools, Revision 25.0.2 | -| build-tools-25.0.3 | Android SDK Build-Tools, Revision 25.0.3 | -| build-tools-26.0.0 | Android SDK Build-Tools, Revision 26.0.0 | -| build-tools-26.0.1 | Android SDK Build-Tools, Revision 26.0.1 | -| build-tools-26.0.2 | Android SDK Build-Tools, Revision 26.0.2 | -| build-tools-26.0.3 | Android SDK Build-Tools, Revision 26.0.3 | -| build-tools-27.0.0 | Android SDK Build-Tools, Revision 27.0.0 | -| build-tools-27.0.1 | Android SDK Build-Tools, Revision 27.0.1 | -| build-tools-27.0.2 | Android SDK Build-Tools, Revision 27.0.2 | -| build-tools-27.0.3 | Android SDK Build-Tools, Revision 27.0.3 | -| build-tools-28.0.0 | Android SDK Build-Tools, Revision 28.0.0 | -| build-tools-28.0.1 | Android SDK Build-Tools, Revision 28.0.1 | -| build-tools-28.0.2 | Android SDK Build-Tools, Revision 28.0.2 | -| build-tools-28.0.3 | Android SDK Build-Tools, Revision 28.0.3 | -| build-tools-29.0.0 | Android SDK Build-Tools, Revision 29.0.0 | -| build-tools-29.0.1 | Android SDK Build-Tools, Revision 29.0.1 | -| build-tools-29.0.2 | Android SDK Build-Tools, Revision 29.0.2 | -| build-tools-29.0.3 | Android SDK Build-Tools, Revision 29.0.3 | -| build-tools-30.0.0 | Android SDK Build-Tools, Revision 30.0.0 | -| build-tools-30.0.1 | Android SDK Build-Tools, Revision 30.0.1 | -| build-tools-30.0.2 | Android SDK Build-Tools, Revision 30.0.2 | - -### Android Extra Packages -| Package Name | Version | -| -------------------------- | ------------ | -| Android Support Repository | 47.0.0 | -| Google Play services | 49 | -| Google Repository | 58 | -| NDK | 21.3.6528147 | +### Android +| Package Name | Version | +| -------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | +| Android SDK Platform-Tools | 30.0.4 | +| Android SDK Tools | 26.1.1 | +| Android SDK Platforms | android-30 (rev 3)
android-29 (rev 5)
android-28 (rev 6)
android-27 (rev 3)
android-26 (rev 2)
android-25 (rev 3)
android-24 (rev 2)
android-23 (rev 3)
android-22 (rev 2)
android-21 (rev 2)
android-20 (rev 2)
android-19 (rev 4) | +| Android SDK Build-tools | 30.0.0 30.0.1 30.0.2
29.0.0 29.0.1 29.0.2 29.0.3
28.0.0 28.0.1 28.0.2 28.0.3
27.0.0 27.0.1 27.0.2 27.0.3
26.0.0 26.0.1 26.0.2 26.0.3
25.0.0 25.0.1 25.0.2 25.0.3
24.0.0 24.0.1 24.0.2 24.0.3
23.0.1 23.0.2 23.0.3
22.0.1
21.1.2
20.0.0
19.1.0 | +| NDK | 21.3.6528147 | +| Android Support Repository | 47.0.0 | +| Google APIs | addon-google_apis-google-21
addon-google_apis-google-22
addon-google_apis-google-23
addon-google_apis-google-24 | +| Google Play services | 49 | +| Google Repository | 58 | +| SDK Patch Applier v4 | 1 | +| CMake | 3.10.2
3.6.4111459 | ### Cached Docker images - mcr.microsoft.com/dotnet/framework/aspnet:4.8-windowsservercore-ltsc2019 From 9b09e359e84f9b2cad1c97600d1bf8218b40ce02 Mon Sep 17 00:00:00 2001 From: Mikhail Timofeev <48208649+miketimofeev@users.noreply.github.com> Date: Thu, 8 Oct 2020 19:34:59 +0300 Subject: [PATCH 26/27] [Ubuntu 20] Switch docker-moby installation to prod channel (#1768) * remove condition * remove os.sh --- images/linux/scripts/installers/docker-moby.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/images/linux/scripts/installers/docker-moby.sh b/images/linux/scripts/installers/docker-moby.sh index 49ef6a563..9ae7f8c86 100644 --- a/images/linux/scripts/installers/docker-moby.sh +++ b/images/linux/scripts/installers/docker-moby.sh @@ -7,12 +7,6 @@ set -e # Source the helpers for use with the script source $HELPER_SCRIPTS/install.sh -source $HELPER_SCRIPTS/os.sh - -# There is no stable docker-moby for Ubuntu 20 at the moment -if isUbuntu20 ; then - add-apt-repository "deb [arch=amd64,armhf,arm64] https://packages.microsoft.com/ubuntu/20.04/prod testing main" -fi # Check to see if docker is already installed docker_package=moby From 791e5997fd1fa81801a82c2dffe4edde7f9a19b9 Mon Sep 17 00:00:00 2001 From: Dibir Magomedsaygitov <61747324+dibir-magomedsaygitov@users.noreply.github.com> Date: Thu, 8 Oct 2020 21:44:51 +0300 Subject: [PATCH 27/27] [WIndows] Fix ssh-keyscan on win16 (#1751) * fix ssh-keyscan on win16 * minor change --- images/win/scripts/Installers/Install-Git.ps1 | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/win/scripts/Installers/Install-Git.ps1 b/images/win/scripts/Installers/Install-Git.ps1 index bec4ec1e0..27a619695 100644 --- a/images/win/scripts/Installers/Install-Git.ps1 +++ b/images/win/scripts/Installers/Install-Git.ps1 @@ -38,8 +38,11 @@ Choco-Install -PackageName hub Add-MachinePathItem "C:\Program Files\Git\bin" -# Add well-known SSH host keys to ssh_known_hosts +if (Test-IsWin16) { + $env:Path += ";$env:ProgramFiles\Git\usr\bin\" +} +# Add well-known SSH host keys to ssh_known_hosts ssh-keyscan -t rsa github.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts" ssh-keyscan -t rsa ssh.dev.azure.com >> "C:\Program Files\Git\etc\ssh\ssh_known_hosts"